Revert e3675d8..793ed33

This rolls back to commit e3675d81d39de8e197241cf0dd6af8e9a85764c3.