Revert 4f52d6a..0cbee0b

This rolls back to commit 4f52d6a276a5e57d0f11f5a76f8a87595c3a4835.