Fix botched merge in refactor