This reverts commit 16eed8c9. Causes some failures internally, will share privately with the author.
mentioned in commit 888437e1