Bug 923881. Landed by mistake on previous push. r=fix_mistake