Revert "Merge changes from evanphx"

This reverts commit 73736a898bb7a232dd16efc6f613ecaefba7c26a.