Stop forcing http in returned links and present however called
Authored by: lmayes 2017-11-30
Parent: [r1289]
Child: [r1291]