Revert commit 3ad43e0d44 to give us a little more time to consider how this will impact tooling.
3ad43e0d44