Backed out changeset 9ad40457f58f (bug 936555) for checktest failures.