Backed out changeset cd80b21eb9a0 (bug 856246) for test failures.
Backed out changeset 869f21ccd71a (bug 856246) for test failures.