Fix leftovers of insanely botched merge

I truly don't know how cba2698 happened, but this should clean up the rest of the fallout.