DO NOT MERGE. Use resolved path when inserting and deleting.
am: ebb842e081

* commit 'ebb842e081f2d9eddbeddb9447631fd81e8961b9':
  DO NOT MERGE. Use resolved path when inserting and deleting.