Revert previous for now; resolvepath() has to work for file paths too.