on a Map, we need to pass the key, not the value, to be deleted
Found by FindBugs.

Change-Id: If6fd3d8d56a7c7dfabac31d8ee268939e582f4eb