Compilation fix after merge from 3.4.x.