Revert 960f5ab..80a926c

This rolls back to commit 960f5ab1aeb5d1ec1f6186d64af871bcfbf601e9.