Revert 7d2b05c..f894726

This rolls back to commit 7d2b05c9138542f515e0a0ec9db92ee703b7ff67.