[TIMOB-17613]: Revert TIMOB-10837
Merge pull request #6027 from hieupham007/timob-17613-3_4_X

[TIMOB-17613]: Revert TIMOB-10837