Undoing those fixes...

It seems I wasn't insane when I first wrote it.