It's not really crucial to this PR, just to the cloud foundry http support. Mark mentioned it might be good to combine it with the existing http source, but let's leave that for a different story?