fix breakage introduced with r18315