Undo stray change to clean up the merge