backout bug 985021 (de535cd27ee7) for build breakage r=backout