Really fix compilation with 0.15.x.