Fix reverted validations

don't merge this just yet.