diff --git a/public/app/plugins/datasource/grafana/datasource.js b/public/app/plugins/datasource/grafana/datasource.js
index 16c16211d13..fec34b1f8c1 100644
--- a/public/app/plugins/datasource/grafana/datasource.js
+++ b/public/app/plugins/datasource/grafana/datasource.js
@@ -1,10 +1,9 @@
 define([
   'angular',
   'lodash',
-  'kbn',
   './directives',
 ],
-function (angular, _, kbn) {
+function (angular, _) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -15,11 +14,11 @@ function (angular, _, kbn) {
     }
 
     GrafanaDatasource.prototype.query = function(options) {
-      // get from & to in seconds
-      var from = kbn.parseDate(options.range.from).getTime();
-      var to = kbn.parseDate(options.range.to).getTime();
-
-      return backendSrv.get('/api/metrics/test', { from: from, to: to, maxDataPoints: options.maxDataPoints });
+      return backendSrv.get('/api/metrics/test', {
+        from: options.range.from.valueOf(),
+        to: options.range.to.valueOf(),
+        maxDataPoints: options.maxDataPoints
+      });
     };
 
     GrafanaDatasource.prototype.metricFindQuery = function() {