Merge pull request #3174 from alexanderkyte/revert_jay_relative