Removed a bit of code from a merge conflict I apparenty resolved incompletely.

Doing great with commit numbers, as usual.