fix cherry-pick of r197577, -f32