timob-15535: Revert timob-14615
Merge pull request #5202 from hieupham007/timob-15535

timob-15535: Revert timob-14615