Revert 75a01ca..0755d2c

This rolls back to commit 75a01ca533cf9c6246f02cb2614b7487872f786e.