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

This reverts commit 7e9ea34d450c746df3fed81e6ec3e04376fec00d.