Slightly evil hack to repair skirmish mode.

Fixes #239