Backout rev 994659cbc145 (bug 960312) for various test failures.