Revert 435d6ca..6317fba

This rolls back to commit 435d6caf41235c5306d12ca6ad8ba2d5ca65feb0.