backout bug 985021 (8d622f4ec6e9) for another build breakage on a CLOSED TREE r=backout