Backed out changeset f9d83ec11ca9 (bug 936555) for checktest failures.
CLOSED TREE