For ENG-5588, take a stab at removing the check that is only supposed to run at startup