[mkgmap-dev] Commit: r2887: revert changes from r2885