Revert: the restriction of types broke nested maps