Revert "More HTTP_X_FORWARDED_PROTO header work"

This reverts commit 30ff6ac548bf11a1f204668c217286352d505afa.