Fix leftovers from botched merge