bug 973207 - revert 905460 for nightly crashes r=backout