am 40b207c1: Merge "Using proper key for removing object from the map."

* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.