diff --git a/client/controller/shared.js b/client/controller/shared.js
index <HASH>..<HASH> 100644
--- a/client/controller/shared.js
+++ b/client/controller/shared.js
@@ -24,16 +24,12 @@ export function makeLayoutMiddleware( LayoutComponent ) {
 
 		// On server, only render LoggedOutLayout when logged-out.
 		if ( ! context.isServerSide || ! getCurrentUser( context.store.getState() ) ) {
-			let redirectUri;
-			if ( context.isServerSide ) {
-				redirectUri = `${ context.protocol }://${ context.host }${ context.originalUrl }`;
-			}
 			context.layout = (
 				<LayoutComponent
 					store={ store }
 					primary={ primary }
 					secondary={ secondary }
-					redirectUri={ redirectUri }
+					redirectUri={ context.originalUrl }
 				/>
 			);
 		}
diff --git a/server/isomorphic-routing/index.js b/server/isomorphic-routing/index.js
index <HASH>..<HASH> 100644
--- a/server/isomorphic-routing/index.js
+++ b/server/isomorphic-routing/index.js
@@ -71,8 +71,6 @@ function getEnhancedContext( req, res ) {
 		pathname: req.path,
 		params: req.params,
 		query: req.query,
-		protocol: req.protocol,
-		host: req.headers.host,
 		redirect: res.redirect.bind( res ),
 		res,
 	} );
SSR: Fix reconciliation error on Masterbar login link (#<I>)

A recent PR #<I> changed the `redirect_to` arg in masterbar login links to be relative links instead of absolute links generated from window.location.href.



For server renders, where there was no access to window, this arg was historically being generated as an absolute link to match. This PR changes the server-generated links to be relative to match the client side, fixing some SSR reconciliation errors.