IMO this PR just makes the code more confusing.  I'd rather we removed the need for this validator and then deleted it