#654: data_validator.py, undo changes from b3af218

Resolves #654.