Fix bug from incorrect merge.