Bring back the cake!
This reverts commit 1386cfefb6871d70bac90a0dc643a40044ca0a70.