Rolling back the fix