Revert e341fe6..57406c7

This rolls back to commit e341fe661774f5b408dfeb8d9f771366801f490e.