Revert to before validation code