Backed out changeset 35a85a4e1222 (bug 879656) due to OSX mochitest orange. a=backout