Revert the previous commit.  It didn't help because the compilator testsuite
automatically chomps on anything in the validator testsuite.