Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3
am: 5a066c39a6

* commit '5a066c39a6149d155ba7b4a6aada49bf6bfe240a':
  Revert "Use resolved path for both checking and opening."