Revert c700c75..0b3a3b6

This rolls back to commit c700c752eff53ae291fb564bf5e2bbf9eeca7849.