[mkgmap-dev] Commit r3705: revert unintended changes from r3404