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