Thank you Danny, good idea. And if you’re able to find a fix before the CI goes green, we can close the revert PR in favor of the fix