Comment 7 for bug 1413388

Confirming, though if this looks too risky for 1.7 we may just have to release note it.