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

* commit '80409f3081ae9bae81f6005e12003bde11ed42a0':
  Revert "Use resolved path for both checking and opening."