Make sure that works without patches from #8558