Revert 83561d6..88ee1b3

This rolls back to commit 83561d6fb3e07300d3b339d11857e4676fa2063c.