Followup to Icb22b12ff30dc8f6a48506c00eb00705fa1de470

cherry-pick to Epoxy went wrong, removed necessary code,
return it back.

Squash into Icb22b12ff30dc8f6a48506c00eb00705fa1de470
when cherry-picking further.

Related-Issue: PRODX-14186
Change-Id: I6d324ff783fd5810fbf76766c161ce7593356048
1 file changed