[mkgmap-dev] Commit r4810: revert changes from r4809 for now, they caused more trouble