Maybe fixes CI failures. Investigation ongoing, but submitting a possible fix already.
cc @wlampl (RC)