Backed out changeset 0d924e17bba4 (bug 869613) for checktest failures.