Back out 795e9ec338a7 (bug 856272) because of test failures