Revert "Merge pull request #1199 from ke-yu/ChocoButter-2Become1"

This reverts commit 00ce9f8386aac1ca5f0e890cab1e50577c14a19a, reversing
changes made to 042fc17d72934b9c7bd0c0f690b39c4b3946a503.