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