Backout f3a47630d9a6 and 43e6d3d43b50 (bug 1058150) for breaking builds. r=backout CLOSED TREE