Reverging use of URI::join because it didn't really work.
Credit Opbeat instead of Ron.