Revert e362d24..87c0165

This rolls back to commit e362d240d1fa0597d948b26092e35d0bc629a718.