Merge pull request #12379 from lightsofapollo/backout-incremental-commits

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