Revert "Merge pull request #5 from dginev/pathname-enhancements"

Accidentally merged the wrong request; This one isn't quite ready.
(the user's directory should always be first searched)

This reverts commit 6edc8667c72ec1410496cae18c05f7d673c396ba, reversing
changes made to 29543bc76ba857f68fd700a7e7b4aface7e9b742.