Revert 2c0eba7..94e865a

This rolls back to commit 2c0eba7f615f243fbd8a7d5fd5ee2d36c62dbfe3.