Backout changesets fad675db4598 and 618d8f44d9e2 (bug 1090168 pt 1 and 2) for Nightly crashiness. a=backout