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

* commit '78b21c54af58acd7acc40f1cd010a8cf8ed1d07b':
  Revert "Use resolved path for both checking and opening."