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