While it isn't clear why this patch helps, it doesn't seem to have any negative
effects, so let's include it for now...