Revert "[BZ107] Fix player crash (but not display problems) when using maps 7.0"

This reverts commit 9ac1596c8ead3d039d49d176f2ff6231da651b76.