Revert "Merge branch 'master' into Japanese"

This reverts commit 6c765f00c1c5b9fe263438693aa0e654c6903191, reversing
changes made to cebe8796c8fdce088474d2542b897519c83f1756.