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