CR changes: removed mapTypeHasBeenChosenAlready flag