Fix for bad manual merge that st3fan did.