Merge change I4d31288f into eclair

* changes:
  Fix for 1974140. Delete entry if not valid on hitting home.