This affects both the non-experimental and experimental engine paths, and so may break tests, but this is a necessary change.