r24661: Fix some obvious diffs between 3_2 and 3_2_0