Revert "Use resolved path for both checking and opening."
am: 6947a091f1

* commit '6947a091f1d9d2b62f5d4a6429df2679ffe5434b':
  Revert "Use resolved path for both checking and opening."