For ENG-5865, comment out accidental expensive validation