Backed out changeset eb8b971070eb (bug 844852) for checktest failures.
CLOSED TREE