Correct botched merge

Fix a previous botched merge