diff --git a/src/Gatekeeper.sol b/src/Gatekeeper.sol
index 3b7ed45..f66c2f3 100644
--- a/src/Gatekeeper.sol
+++ b/src/Gatekeeper.sol
@@ -59,6 +59,9 @@ contract Gatekeeper is IGatekeeper, Weaver, ReentrancyGuard  {
             require(previousStorage != address(0));
 
             storageHistory = previousStorage;
+            // TODO: uncomment line below, needed only for testing purposes
+            // This one should always drop the deployer.
+            // deployer = address(0);
             deployer = IGatekeeper(_previousGatekeeperAddress).deployer();
             Weaver._initialize(_previousGatekeeperAddress);