Restore use of relative paths. Re: GH-58