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