ENG-5368: revert changes.