For ENG-5400 revert some unrelated script changes