Revert "Merge pull request #10981 from ganesh7/bug_819628"

This reverts commit 8a91b987b57e01d03eded32c33a68595bd0949cb, reversing
changes made to dfff18a59944e64f527030ff71223f30d8f45840.
Merge pull request #12379 from lightsofapollo/backout-incremental-commits

Revert "Merge pull request #10981 from ganesh7/bug_819628"