Related to the partial revert done for T97272. It seems also that the workaround should be enabled for any MACOS platform.