Revert "Merge remote branch 'origin/exp-0.8.5.1-cc' into master-0.8"

This reverts commit 0541ebf054a09f7ca195b8e7043741083e4bdbbb, reversing
changes made to a30857dcc05a126a49973195bb4c362cefcf0a56.