Backed out changeset 65e611823b0f (bug 1062566) for checktest failures.