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

* commit '9294cf83d93386caae1103ea9c969ff3e6e8f85d':
  Revert "Use resolved path for both checking and opening."