Remove errant code addition from bad merge