[mkgmap-dev] Commit r4294: revert changes from r4292 + r4291: Needs more testing