Fix 2.9 backporting issues.