diff --git a/package.json b/package.json
index 00c5e85e9c5..77d234e6f92 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "phantomjs-prebuilt": "^2.1.15",
     "rxjs": "^5.4.3",
     "sass-lint": "^1.10.2",
-    "systemjs": "0.19.41"
+    "systemjs": "0.20.19"
   },
   "scripts": {
     "build": "./node_modules/grunt-cli/bin/grunt",
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.d.ts b/public/app/plugins/datasource/cloudwatch/datasource.d.ts
index afc49d07dea..52adda4164d 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.d.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.d.ts
@@ -1,3 +1,3 @@
 declare var CloudWatchDatasource: any;
-export {CloudWatchDatasource};
+export default CloudWatchDatasource;
 
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 2ec89b854c6..0f0406a219c 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -471,7 +471,5 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
 
   }
 
-  return {
-    CloudWatchDatasource: CloudWatchDatasource
-  };
+  return CloudWatchDatasource;
 });
diff --git a/public/app/plugins/datasource/cloudwatch/module.ts b/public/app/plugins/datasource/cloudwatch/module.ts
index e2e70ca5f7c..abd68bf47aa 100644
--- a/public/app/plugins/datasource/cloudwatch/module.ts
+++ b/public/app/plugins/datasource/cloudwatch/module.ts
@@ -1,6 +1,6 @@
 import './query_parameter_ctrl';
 
-import {CloudWatchDatasource} from './datasource';
+import CloudWatchDatasource from './datasource';
 import {CloudWatchQueryCtrl} from './query_ctrl';
 import {CloudWatchConfigCtrl} from './config_ctrl';
 
diff --git a/public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts
index d469ca8685b..8e9bb5a0c9e 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts
@@ -2,7 +2,7 @@ import "../datasource";
 import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
 import moment from 'moment';
 import helpers from 'test/specs/helpers';
-import {CloudWatchDatasource} from "../datasource";
+import CloudWatchDatasource from "../datasource";
 import CloudWatchAnnotationQuery from '../annotation_query';
 
 describe('CloudWatchAnnotationQuery', function() {
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
index 0130aee60d3..48824f051c7 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
@@ -2,7 +2,7 @@
 import "../datasource";
 import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
 import helpers from 'test/specs/helpers';
-import {CloudWatchDatasource} from "../datasource";
+import CloudWatchDatasource from "../datasource";
 
 describe('CloudWatchDatasource', function() {
   var ctx = new helpers.ServiceTestContext();
diff --git a/public/app/plugins/datasource/opentsdb/datasource.d.ts b/public/app/plugins/datasource/opentsdb/datasource.d.ts
index bbbf1680f27..2e722bc1976 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.d.ts
+++ b/public/app/plugins/datasource/opentsdb/datasource.d.ts
@@ -1,3 +1,3 @@
 declare var OpenTsDatasource: any;
-export {OpenTsDatasource};
+export default OpenTsDatasource;
 
diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index 921805a58ca..5228ce26b9c 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -472,7 +472,5 @@ function (angular, _, dateMath) {
     }
   }
 
-  return {
-    OpenTsDatasource: OpenTsDatasource
-  };
+  return OpenTsDatasource;
 });
diff --git a/public/app/plugins/datasource/opentsdb/module.ts b/public/app/plugins/datasource/opentsdb/module.ts
index 895cbe2ad8c..a34ee2219fe 100644
--- a/public/app/plugins/datasource/opentsdb/module.ts
+++ b/public/app/plugins/datasource/opentsdb/module.ts
@@ -1,4 +1,4 @@
-import {OpenTsDatasource} from './datasource';
+import OpenTsDatasource from './datasource';
 import {OpenTsQueryCtrl} from './query_ctrl';
 import {OpenTsConfigCtrl} from './config_ctrl';
 
diff --git a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
index cddcd621c01..13379824485 100644
--- a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
+++ b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
@@ -1,6 +1,6 @@
 import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
 import helpers from 'test/specs/helpers';
-import {OpenTsDatasource} from "../datasource";
+import OpenTsDatasource from "../datasource";
 
 describe('opentsdb', function() {
   var ctx = new helpers.ServiceTestContext();
diff --git a/yarn.lock b/yarn.lock
index a6867bfc18b..f5105d40f03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4448,11 +4448,9 @@ systemjs-builder@^0.16.10:
     traceur "0.0.105"
     uglify-js "^2.6.1"
 
-systemjs@0.19.41:
-  version "0.19.41"
-  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.41.tgz#835d2c0f10bf403b551fedc875f84bb44a02c4eb"
-  dependencies:
-    when "^3.7.5"
+systemjs@0.20.19:
+  version "0.20.19"
+  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.19.tgz#c2b9e79c19f4bea53a19b1ed3f974ffb463be949"
 
 systemjs@^0.19.46:
   version "0.19.47"