diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65f095a..053c8ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change log
 
+### 1.7.0
+
+* Fixed:   Remove split RhubarbDate implementation for compatibility reasons
+
 ### 1.6.11
 
 * Added:   Sendable priority
diff --git a/src/DateTime/RhubarbDate.php b/src/DateTime/RhubarbDate.php
index d99f05c..5fc57dd 100644
--- a/src/DateTime/RhubarbDate.php
+++ b/src/DateTime/RhubarbDate.php
@@ -20,7 +20,7 @@
 
 use DateTimeZone;
 
-abstract class AbstractRhubarbDate extends RhubarbDateTime
+class RhubarbDate extends RhubarbDateTime
 {
     public function __construct($dateValue = '', DateTimeZone $timezone = null)
     {
@@ -40,22 +40,9 @@ public static function createFromFormat($format, $time, $timezone = null)
         $date = parent::createFromFormat($format, $time, $timezone);
         return new RhubarbDate($date);
     }
-}
 
-if (PHP_VERSION_ID >= 70100) {
-    class RhubarbDate extends AbstractRhubarbDate
-    {
-        public function setTime($hour, $minute, $second = 0, $microseconds = 0)
-        {
-            return parent::setTime(0, 0, 0, 0);
-        }
-    }
-} else {
-    class RhubarbDate extends AbstractRhubarbDate
+    public function setTime($hour, $minute, $second = 0, $microseconds = 0)
     {
-        public function setTime($hour, $minute, $second = 0)
-        {
-            return parent::setTime(0, 0, 0);
-        }
+        return parent::setTime(0, 0, 0, 0);
     }
 }