From ca5bcd54a9f0170fddb8b6c7dfcf51489db60761 Mon Sep 17 00:00:00 2001
From: Brian Mann <brian@backbonerails.com>
Date: Thu, 7 May 2015 13:11:39 -0400
Subject: [PATCH] reverted location overrides

---
 app/js/api/cypress/location.coffee | 13 +++++++------
 lib/secret_sauce.coffee            |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/js/api/cypress/location.coffee b/app/js/api/cypress/location.coffee
index 8ea313feccd1..c1f7cbde3554 100644
--- a/app/js/api/cypress/location.coffee
+++ b/app/js/api/cypress/location.coffee
@@ -142,12 +142,13 @@ $Cypress.Location = do ($Cypress, _, Uri) ->
           ## let our function know we've navigated
           navigated()
 
-      _.each ["hash", "host", "hostname", "origin", "pathname", "port", "protocol", "search"], (attr) ->
-        try
-          Object.defineProperty win.location, attr, {
-            get: ->
-              location(attr)
-          }
+      # _.each ["hash", "host", "hostname", "origin", "pathname", "port", "protocol", "search"], (attr) ->
+      #   try
+      #     Object.defineProperty win.location, attr, {
+      #       get: ->
+      #         location(attr)
+
+      #     }
 
     ## think about moving this method out of Cypress
     ## and into our app, since it kind of leaks the
diff --git a/lib/secret_sauce.coffee b/lib/secret_sauce.coffee
index 07e4118c78cc..b39b0e69f41b 100644
--- a/lib/secret_sauce.coffee
+++ b/lib/secret_sauce.coffee
@@ -595,7 +595,8 @@ SecretSauce.RemoteInitial =
 
         ## reset the session to the latest redirected URL
         @setSessionRemoteUrl(req, url)
-        rq.pipe(tr).pipe(thr)
+        rq.pipe(thr)
+        # rq.pipe(tr).pipe(thr)
 
     ## set the headers on the hyperquest request
     ## this will naturally forward cookies or auth tokens