[TIMOB-17724]: Revert TIMOB-15621.
Merge pull request #6135 from hieupham007/timob-17724-3_4_X

[TIMOB-17724]: Revert TIMOB-15621.