Revert to ee89a45a3c8466aeeea32ac54d50aa551684a8f7