Bugfix: Removing a line that shouldn't have been brought back in during merge