Revert [28610] in order to avoid infinite redirect loops on reverse proxies which proxy from HTTPS to HTTP.

Merges [30090] to the 4.0 branch.

fixes #28610.

Built from https://develop.svn.wordpress.org/branches/4.0@30253


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30253 1a063a9b-81f0-0310-95a4-ce76da25c4cd