(PDB-950) Reverted some of the regexp validation since it was moved to another PR