r25059: Apply to 3.2 as well