Revert e64aa93f8