Port a quick fix from @Immortius to multiplayer branch in preparation of making a one-time stable build before retiring it soon.