Revert r222957 "Replace std::map<K, V*> with std::map<K, V> to handle ownership and...