Backed out changeset d9e136a02980 (bug 986171) for build bustage r=backout