Revert 70a2bed..9d6f190

This rolls back to commit 70a2bedb24bbcb7ffdbe2e8d5ccc768a870fd363.