Kibana 4 using fielddata_fields in query

Elastic Stack Kibana
1

I have a large Elasticsearch cluster that has been suffering from poor performance due to field data issues. I finally switched over to doc values for everything, but I just realized that Kibana 4 is specifying fielddata_fields in the default query for Discover. I can't find any information on how to fix this.

Here's the request:

{
  "size": 500,
  "sort": [
    {
      "@timestamp": {
        "order": "desc",
        "unmapped_type": "date"
      }
    }
  ],
  "highlight": {
    "pre_tags": [
      "@kibana-highlighted-field@"
    ],
    "post_tags": [
      "@/kibana-highlighted-field@"
    ],
    "fields": {
      "*": {}
    },
    "fragment_size": 2147483647
  },
  "aggs": {
    "2": {
      "date_histogram": {
        "field": "@timestamp",
        "interval": "30m",
        "pre_zone": "-06:00",
        "pre_zone_adjust_large_interval": true,
        "min_doc_count": 0,
        "extended_bounds": {
          "min": 1453788000000,
          "max": 1453874399999
        }
      }
    }
  },
  "query": {
    "filtered": {
      "query": {
        "match_all": {}
      },
      "filter": {
        "bool": {
          "must": [
            {
              "range": {
                "@timestamp": {
                  "gte": 1453788000000,
                  "lte": 1453874399999
                }
              }
            }
          ],
          "must_not": []
        }
      }
    }
  },
  "fields": [
    "*",
    "_source"
  ],
  "script_fields": {},
  "fielddata_fields": [
    "millis",
    "@timestamp"
  ]
}
2

Are you getting an error? What exactly is happening? If you're getting an error it might be best to go ahead and file an issue here https://github.com/elastic/kibana/issues