diff --git a/src/kibana/plugins/settings/sections/indices/_date_scripts.js b/src/kibana/plugins/settings/sections/indices/_date_scripts.js
index a6c23c317003..d3fe34c7c026 100644
--- a/src/kibana/plugins/settings/sections/indices/_date_scripts.js
+++ b/src/kibana/plugins/settings/sections/indices/_date_scripts.js
@@ -2,28 +2,23 @@ define(function (require) {
   var _ = require('lodash');
 
   return function (indexPattern) {
-
-
-    function getScript(field, format) {
-      return 'Integer.parseInt(new Date(doc["' + field + '"].value).format("' + format + '"))';
-    }
-
     var dateScripts = {};
     var scripts = {
-      __minuteOfHour: 'm',
-      __hourOfDay:    'H',
-      __dayOfWeek:    'u',
-      __dayOfMonth:   'd',
-      __dayOfYear:    'D',
-      __weekOfMonth:  'W',
-      __weekOfYear:   'w',
-      __monthOfYear:  'M'
+      __dayOfMonth:   'dayOfMonth',
+      __dayOfWeek:    'dayOfWeek',
+      __dayOfYear:    'dayOfYear',
+      __hourOfDay:    'hourOfDay',
+      __minuteOfDay:  'minuteOfDay',
+      __minuteOfHour: 'minuteOfHour',
+      __monthOfYear:  'monthOfYear',
+      __weekOfYear:   'weekOfWeekyear',
+      __year:         'year'
     };
 
     _.each(indexPattern.fields.byType['date'], function (field) {
       if (field.indexed) {
-        _.each(scripts, function (format, scriptKey) {
-          dateScripts[field.name + '.' + scriptKey] = getScript(field.name, format);
+        _.each(scripts, function (value, key) {
+          dateScripts[field.name + '.' + key] = 'doc["' + field.name + '"].date.' + value;
         });
       }
     });