Revert e19f9ac..59d9a26

This rolls back to commit e19f9ac0a07cce1a06b580fd3731e3c7b8d7723c.