Revert "Merge pull request #490 from justinstoller/maint/master/remove_cruft"

This reverts commit 715b335f7f7623f00a28312072b0ec1123965eb3, reversing
changes made to 3b4891b6acaa6932be950ff51995c7191410acdb.
Merge pull request #507 from anodelman/revert-cruft-removal

Revert "Merge pull request #490 from justinstoller/maint/master/remove_cruft"