This reverts commit 16eed8c906. Causes some failures internally, will share privately with the author.
16eed8c906