Fix build

Ah, the joy of automatic mismerges...