r20915: Fixed the bad merge from 3.0.24.