This reverts commit fff7f15fb88f6683f9d73565d8d59593ecf7461a.

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