Revert: the restriction of types broke nested maps
Merge pull request #3014 from pontusmelke/revert-strict-type-checking

Revert: the restriction of types broke nested maps