Revert b6c83bf..8c0383d

This rolls back to commit b6c83bf56e4d0ca870fd37632e4e8e7553e50bdb.