This is a manual cherry-pick that @akraszna introduced in 21.2. I'm not sure if this can go into master as it is, but current defaults do not work anyways, so why not 😊
Would still like to run full-unit-tests just to make sure this does not break anything.