Revert 4ba226a..7801ef7

This rolls back to commit 4ba226ad41ff36e2e338c6ea000f9cc5a00c6d66.