Removed a bit that didn't merge right

I removed some code but the merge commit in the other branch didn't
transfer over to this one very well.  There is still a little bit of
dirty code in this branch but I don't care.  It compiles, ship it!  (It
works fine in the editor...)