diff --git a/composer.json b/composer.json
index 1928012..8bb83d9 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 
     "require": {
         "php":                ">=5.3.1",
-        "behat/mink":         "~1.5.0@dev",
+        "behat/mink":         "dev-2-architecture-changes",
         "behat/sahi-client":  "~1.1.0@dev"
     },
 
diff --git a/src/Behat/Mink/Driver/SahiDriver.php b/src/Behat/Mink/Driver/SahiDriver.php
index 6e76319..09d7173 100644
--- a/src/Behat/Mink/Driver/SahiDriver.php
+++ b/src/Behat/Mink/Driver/SahiDriver.php
@@ -2,8 +2,6 @@
 
 namespace Behat\Mink\Driver;
 
-use Behat\Mink\Element\NodeElement;
-use Behat\Mink\Session;
 use Behat\SahiClient\Client;
 use Behat\SahiClient\Exception\ConnectionException;
 
@@ -25,7 +23,6 @@ class SahiDriver extends CoreDriver
     private $started = false;
     private $browserName;
     private $client;
-    private $session;
 
     /**
      * Initializes Sahi driver.
@@ -53,16 +50,6 @@ public function getClient()
         return $this->client;
     }
 
-    /**
-     * Sets driver's current session.
-     *
-     * @param Session $session
-     */
-    public function setSession(Session $session)
-    {
-        $this->session = $session;
-    }
-
     /**
      * Starts driver.
      */
@@ -260,7 +247,7 @@ public function find($xpath)
         $count = intval($this->evaluateScript($function));
         $elements = array();
         for ($i = 0; $i < $count; $i++) {
-            $elements[] = new NodeElement(sprintf('(%s)[%d]', $xpath, $i + 1), $this->session);
+            $elements[] = sprintf('(%s)[%d]', $xpath, $i + 1);
         }
 
         return $elements;