r10396: fix build breakage after an incomplete merge from 3.0