diff --git a/.travis.yml b/.travis.yml
index 2c7bef4..30f5601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,5 @@ matrix:
     - php: hhvm
 
 before_script:
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "session.serialize_handler = php" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
   - composer install --dev --prefer-source
diff --git a/src/Ratchet/Session/SessionProvider.php b/src/Ratchet/Session/SessionProvider.php
index 8aefc96..a8495b2 100644
--- a/src/Ratchet/Session/SessionProvider.php
+++ b/src/Ratchet/Session/SessionProvider.php
@@ -56,14 +56,7 @@ class SessionProvider implements MessageComponentInterface, WsServerInterface {
         $this->setOptions($options);
 
         if (null === $serializer) {
-            // Temporarily fixing HHVM issue w/ reading ini values
-            $handler_name = ini_get('session.serialize_handler');
-            if ('' === $handler_name) {
-                trigger_error('ini value session.seralize_handler was empty, assuming "php" - tmp hack/fix, bad things might happen', E_USER_WARNING);
-                $handler_name = 'php';
-            }
-
-            $serialClass = __NAMESPACE__ . "\\Serialize\\{$this->toClassCase($handler_name)}Handler"; // awesome/terrible hack, eh?
+            $serialClass = __NAMESPACE__ . "\\Serialize\\{$this->toClassCase(ini_get('session.serialize_handler'))}Handler"; // awesome/terrible hack, eh?
             if (!class_exists($serialClass)) {
                 throw new \RuntimeException('Unable to parse session serialize handler');
             }