revert workaround for mutable map