Revert "Merge pull request #1220 from Randy-Ma/ChocoButter-2Become1"

This reverts commit 451240ce1703d1cb8a651fa60dfccfc3c30280e6, reversing
changes made to 1cd447b999258a03c745c741f6062dd937a77c59.