ENG-5975: Trying fix #3.