Revert f33e9b7..67e3a52

This rolls back to commit f33e9b73aa60773eaa42465f19974cf6849003e5.