Update to the earlier fix for 1326969