diff --git a/frontend/app/components/chart/g-blank-flat.js b/frontend/app/components/chart/g-blank-flat.js
index 7ac031f6..78bbf2ac 100644
--- a/frontend/app/components/chart/g-blank-flat.js
+++ b/frontend/app/components/chart/g-blank-flat.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import Graphable from 'flaredown/components/chart/graphable';
+import * as d3 from "d3";
 
 const {
   get,
diff --git a/frontend/app/components/chart/g-blank-trackable.js b/frontend/app/components/chart/g-blank-trackable.js
index 04356462..b286e5dd 100644
--- a/frontend/app/components/chart/g-blank-trackable.js
+++ b/frontend/app/components/chart/g-blank-trackable.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import Graphable from 'flaredown/components/chart/graphable';
+import * as d3 from "d3";
 
 const {
   computed,
diff --git a/frontend/app/components/chart/g-flat.js b/frontend/app/components/chart/g-flat.js
index 2223cb1f..0252ae91 100644
--- a/frontend/app/components/chart/g-flat.js
+++ b/frontend/app/components/chart/g-flat.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import moment from 'moment';
 import Graphable from 'flaredown/components/chart/graphable';
+import * as d3 from "d3";
 
 const {
   get,
diff --git a/frontend/app/components/chart/g-hbi.js b/frontend/app/components/chart/g-hbi.js
index f79a58e0..ae957268 100644
--- a/frontend/app/components/chart/g-hbi.js
+++ b/frontend/app/components/chart/g-hbi.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import moment from 'moment';
 import Colorable from 'flaredown/mixins/colorable';
 import Graphable from 'flaredown/components/chart/graphable';
+import * as d3 from "d3";
 
 const {
   $,
diff --git a/frontend/app/components/chart/g-timeline.js b/frontend/app/components/chart/g-timeline.js
index 90e1ddf2..b360814e 100644
--- a/frontend/app/components/chart/g-timeline.js
+++ b/frontend/app/components/chart/g-timeline.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import moment from 'moment';
+import * as d3 from "d3";
 
 export default Ember.Component.extend( {
   tagName: 'g',
diff --git a/frontend/app/components/chart/g-trackable.js b/frontend/app/components/chart/g-trackable.js
index ca8cff3a..2f7d98f4 100644
--- a/frontend/app/components/chart/g-trackable.js
+++ b/frontend/app/components/chart/g-trackable.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import moment from 'moment';
 import Graphable from 'flaredown/components/chart/graphable';
+import * as d3 from "d3";
 
 const {
   $,
diff --git a/frontend/app/components/chart/g-weather.js b/frontend/app/components/chart/g-weather.js
index 2a44f3b2..1386fc54 100644
--- a/frontend/app/components/chart/g-weather.js
+++ b/frontend/app/components/chart/g-weather.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import moment from 'moment';
+import * as d3 from "d3";
 import Colorable from 'flaredown/mixins/colorable';
 import Graphable from 'flaredown/components/chart/graphable';
 
diff --git a/frontend/app/components/chart/graphable.js b/frontend/app/components/chart/graphable.js
index 95eff8bf..e6e70445 100644
--- a/frontend/app/components/chart/graphable.js
+++ b/frontend/app/components/chart/graphable.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from "d3";
 
 /* no-unexpected-multiline: "error" */
 
diff --git a/frontend/app/components/health-chart.js b/frontend/app/components/health-chart.js
index b925bd77..695cfc70 100644
--- a/frontend/app/components/health-chart.js
+++ b/frontend/app/components/health-chart.js
@@ -4,6 +4,7 @@ import { extendMoment } from 'moment-range';
 import Resizable from './chart/resizable';
 import FieldsByUnits from 'flaredown/mixins/fields-by-units';
 import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
+import * as d3 from "d3";
 
 const moment = extendMoment(Moment);
 
diff --git a/frontend/app/components/pattern/chart-group.js b/frontend/app/components/pattern/chart-group.js
index 5fe4ba97..87594aeb 100644
--- a/frontend/app/components/pattern/chart-group.js
+++ b/frontend/app/components/pattern/chart-group.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import moment from 'moment';
-
-/* global d3 */
+import * as d3 from "d3";
 
 const {
   get,
diff --git a/frontend/app/components/pattern/chart-hover.js b/frontend/app/components/pattern/chart-hover.js
index 7723b2c1..7b7614db 100644
--- a/frontend/app/components/pattern/chart-hover.js
+++ b/frontend/app/components/pattern/chart-hover.js
@@ -1,8 +1,6 @@
 import Ember from 'ember';
 import moment from 'moment';
 
-/* global d3 */
-
 const {
   $,
   get,
diff --git a/frontend/app/components/pattern/chart-item.js b/frontend/app/components/pattern/chart-item.js
index adb0bfa4..d429c464 100644
--- a/frontend/app/components/pattern/chart-item.js
+++ b/frontend/app/components/pattern/chart-item.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import moment from 'moment';
-
-/* global d3 */
+import * as d3 from "d3";
 
 const {
   $,
diff --git a/frontend/app/components/pattern/chart-legend-item.js b/frontend/app/components/pattern/chart-legend-item.js
index 7255e29b..1c73993f 100644
--- a/frontend/app/components/pattern/chart-legend-item.js
+++ b/frontend/app/components/pattern/chart-legend-item.js
@@ -1,7 +1,5 @@
 import Ember from 'ember';
 
-/* global d3 */
-
 const {
   get,
   computed,
diff --git a/frontend/bower.json b/frontend/bower.json
index 2b9a7f87..d947062e 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -2,7 +2,6 @@
   "name": "flaredown",
   "dependencies": {
     "pace": "vectart/pace",
-    "d3": "~3.5.13",
     "pickadate": "^3.5.6",
     "At.js": "^1.5.4"
   }
diff --git a/frontend/ember-cli-build.js b/frontend/ember-cli-build.js
index 841c7ca9..c3fa7f96 100644
--- a/frontend/ember-cli-build.js
+++ b/frontend/ember-cli-build.js
@@ -71,9 +71,6 @@ module.exports = function(defaults) {
   // Spinkit
   app.import('node_modules/spinkit/spinkit.css')
 
-  // d3
-  app.import(app.bowerDirectory + '/d3/d3.min.js');
-
   // HTML5 Drag and Drop Polyfill for Mobile
   app.import('node_modules/mobile-drag-drop/default.css')
   app.import('node_modules/mobile-drag-drop/icons.css')