Revert e2b4245..ba9a155

This rolls back to commit e2b4245d6d9995fe43f8172f34274debf2cec6b2.