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

timob-15535: Revert timob-14615
[TIMOB-16164] Optimize refresh with readd YES
Merge pull request #5212 from vishalduggal/timob-16164

[TIMOB-16164] Optimize refresh with readd YES