Revert "remove unneccessary calls to getMapConfig() within the same method"

This reverts commit 5755a3cf617b4b201663a477a353ffa6dbac747d.