This reverts commit fff7f15fb8. This commit was not intended to be cherry-picked into the 0.10.x branch.
fff7f15fb8