Fix 2.9.1/2.9.2 build break.