ENG-6472, revert incomplete js changes