Revert "Merge remote-tracking branch 'upstream/master' into worldmap-improvements-dev"

This reverts commit 7448af25dff607c2e00972c4e0d42f708eb6f80f, reversing
changes made to e2782be2c200f2aab70d28f448b244c7e9d66f43.