am 297abc6d: Merge "Remove calls to Entry::~Entry in Delete"

* commit '297abc6d63a2ebb3ed244f9c1f4986d0569c4ba8':
  Remove calls to Entry::~Entry in Delete