diff --git a/src/view.flot.js b/src/view.flot.js
index 70493ff7..20d9c374 100644
--- a/src/view.flot.js
+++ b/src/view.flot.js
@@ -191,8 +191,8 @@ my.Flot = Backbone.View.extend({
       if (typeof label !== 'string') {
         label = label.toString();
       }
-      if (self.state.attributes.graphType !== 'bars' && label.length > 8) {
-        label = label.slice(0, 5) + "...";
+      if (self.state.attributes.graphType !== 'bars' && label.length > 10) {
+        label = label.slice(0, 10) + "...";
       }
 
       return label;
@@ -322,12 +322,7 @@ my.Flot = Backbone.View.extend({
         var isDateTime = (xtype === 'date' || xtype === 'date-time' || xtype  === 'time');
 
         if (isDateTime) {
-          if (self.state.attributes.graphType != 'bars' &&
-              self.state.attributes.graphType != 'columns') {
-            x = new Date(x).getTime();
-          } else {
-            x = index;
-          }
+          x = index;
         } else if (typeof x === 'string') {
           x = parseFloat(x);
           if (isNaN(x)) {