Fix bad merge - These lines should have been removed.