Workaround for #28530