revert two previous commits as these do not fix problems with validation tests