Revert e1ab0b5..1057652

This rolls back to commit e1ab0b5e8d29bbabad352f445590265226a054b5.