[DF-4841] Fix to be like prev version.