Revert "Fix rebase mistake"

This reverts commit 2599d78a220362d23e91f2010a24cf902b270c79.
Revert "First taste of cupcake -- Yum! :P"

This reverts commit ae05938c20c0cabfd828d55a3db692a91ce87019.