Backed out changesets 8be8d3dd116b and 6abcab74130a (bug 1073698) for checktest failures.