Bug 941416 - Fix regression of bug 936995, r=gyeh