We should revert the workaround for #40358 at some point. It seems we can do so with the switch to the 11.0 SDK as we plan to do in #40158.