Revert "https://reviews.apache.org/r/9408/"

This reverts commit 1a67300f2338b683316939c8facd0a4fdb3b9d15.
WIP