Original patch by Fujii Masao, with heavy editing and bitrot-fixing
after my other commit.