This reverts commit f0c46639. This caused problems in downstream projects. We are reverting to give them more time for integration.