Comment the fix to Trac #7702