Revert "Smartypants!"

This reverts commit a87c4980e12b6f982b8f84890e56ab1819b48a31.