Backout changeset 47c7022e4e11 for bug 913444

--HG--
extra : rebase_source : 6d3b0bd5c4ea52561fba9b358dae8b7843f10205
Backout changeset 3fb9ea77d858 for bug 876321 due to test failures (CLOSED TREE)

--HG--
extra : rebase_source : 6b21bf36f9a8bd73bdd72ddfb5fe8c25e7854071