From 02014f915e436cd6ebdb59198a61d0bb67112a17 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sat, 27 Feb 2016 12:04:28 -0500
Subject: [PATCH] revert fix for #1028: can't be fixed without bad side effects

---
 src/js/tab.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/js/tab.js b/src/js/tab.js
index 8a0300dc2..b7b92897e 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -696,7 +696,7 @@ vAPI.tabs.onPopupUpdated = (function() {
         // Log only for when there was a hit against an actual filter (allow or block).
         if ( µb.logger.isEnabled() ) {
             µb.logger.writeOne(
-                openerTabId,
+                popupType === 'popup' ? openerTabId : targetTabId,
                 'net',
                 result,
                 popupType,
@@ -725,11 +725,12 @@ vAPI.tabs.onPopupUpdated = (function() {
         }
 
         // It is a popup, block and remove the tab.
-        µb.unbindTabFromPageStats(targetTabId);
-
-        vAPI.tabs.remove(targetTabId, true);
-        if ( popupType === 'popunder' ) {
-            vAPI.tabs.replace(openerTabId, targetURL);
+        if ( popupType === 'popup' ) {
+            µb.unbindTabFromPageStats(targetTabId);
+            vAPI.tabs.remove(targetTabId, true);
+        } else {
+            µb.unbindTabFromPageStats(openerTabId);
+            vAPI.tabs.remove(openerTabId, true);
         }
 
         return true;