[CLC-1741] Revert changes from CLC-1709
Merge pull request #1034 from yuhunglin/CLC-1741

[CLC-1741] Revert changes from CLC-1709