Fix compilation error introduced by botched merge