Fixed lines accidentally re-added during a merge