Revert "Minor WIN32/POSIX bug in resolve_origin()"