Comment 7 for bug 2007603

This was introduced by the patch for bug 1948693, which accounts for why this was a problem in that particular 3.10 test system but only crops up in stock systems as of 3.11.