Comment 34 for bug 1251590

Here's the Havana patch. Am I correct to assume that we will want to fix this in Grizzly as well?