selectively reenable the fix for issue 2212 (fixes issue 2311)