Comment 37 for bug 1251590

@Nikola: if Grizzly is affected we'll want this patch for Grizzly as well.