Back to Smartypants!

This reverts commit 4ddea2c265cd7d64c8b827e1e797f335cfcbf94c.