ENG-5901: revert sys fragments