Removed the fix of 1086521 from line 109