Revert "Merge pull request #772 from alameluchidambaram/CONN-1074A"
Revert "Merge pull request #772 from alameluchidambaram/CONN-1074A"

This reverts commit ff4ce73e04037175344efd3773dfb604c263e905, reversing
changes made to 226f6801007151bef80d0ea19f067813efe59a8b.

beiyuxinke/CONNECT,healthreveal/CONNECT,healthreveal/CONNECT,beiyuxinke/CONNECT,beiyuxinke/CONNECT,healthreveal/CONNECT,beiyuxinke/CONNECT,healthreveal/CONNECT,beiyuxinke/CONNECT,healthreveal/CONNECT