Revert "本家の更新取り込み"

This reverts commit 31afdecffee63e9783dad872ecbd9cc4b17c71e6.