diff --git a/ArangoDbConnection.php b/ArangoDbConnection.php
deleted file mode 100644
index 26c79f0..0000000
--- a/ArangoDbConnection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace devgroup\arangodb;
-
-use \triagens\ArangoDb\ConnectionOptions;
-
-class ArangoDbConnection extends \triagens\ArangoDb\Connection
-{
-    public function json_encode_wrapper($data, $options = null)
-    {
-        if ($this->getOption(ConnectionOptions::OPTION_CHECK_UTF8_CONFORM) === true) {
-            self::check_encoding($data);
-        }
-        
-        $response = json_encode($data, $options | JSON_FORCE_OBJECT);
-        
-        return $response;
-    }
-}
diff --git a/Connection.php b/Connection.php
index f806ba3..e1dde48 100644
--- a/Connection.php
+++ b/Connection.php
@@ -51,7 +51,7 @@ class Connection extends Object
         try {
             Yii::info($token, 'devgroup\arangodb\Connection::open');
             Yii::beginProfile($token, 'devgroup\arangodb\Connection::open');
-            $this->connection = new ArangoDbConnection($this->connectionOptions);
+            $this->connection = new \triagens\ArangoDb\Connection($this->connectionOptions);
             $this->collectionHandler = new CollectionHandler($this->connection);
             $this->documentHandler = new DocumentHandler($this->connection);
             Yii::endProfile($token, 'devgroup\arangodb\Connection::open');