Backed out changeset 4b7de1f2b4a0 (bug 856079) for various test failures.
CLOSED TREE