Revert "doh pt2"

This reverts commit 7761d8fea22abcce28bf9a66f5f93e0277e3fae9.