Revert "Merge remote-tracking branch 'origin/kinouchi'"

This reverts commit a4443c3c9f358ac984cbfb30dd576084d5c35cf2, reversing
changes made to c4fedd167c9e3dd476a7943c623a92af0c09dabf.