For ENG-6153, revert one more change to see the impact