diff --git a/app/app.js b/app/app.js
index 0b1d9ab1..439d816a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
-import getOwner from 'ember-getowner-polyfill';
 import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
diff --git a/app/controllers/current-user.js b/app/controllers/current-user.js
index f5338b51..4f391dd7 100644
--- a/app/controllers/current-user.js
+++ b/app/controllers/current-user.js
@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import getOwner from 'ember-getowner-polyfill';
 
 export default Ember.Controller.extend({
   sync() {
diff --git a/app/controllers/repos.js b/app/controllers/repos.js
index 491b6b8c..ddf651ae 100644
--- a/app/controllers/repos.js
+++ b/app/controllers/repos.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import Repo from 'travis/models/repo';
 import Config from 'travis/config/environment';
-import getOwner from 'ember-getowner-polyfill';
 
 var sortCallback = function(repo1, repo2) {
   // this function could be made simpler, but I think it's clearer this way
diff --git a/app/models/broadcast.js b/app/models/broadcast.js
index 60a8cbff..cece1332 100644
--- a/app/models/broadcast.js
+++ b/app/models/broadcast.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import Model from 'travis/models/model';
 import attr from 'ember-data/attr';
-import getOwner from 'ember-getowner-polyfill';
 
 var indexOf = [].indexOf;
 
diff --git a/app/router.js b/app/router.js
index 036ad592..6a15f60d 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import config from './config/environment';
 import Location from 'travis/utils/location';
-import getOwner from 'ember-getowner-polyfill';
 
 var Router = Ember.Router.extend({
   location: function() {
diff --git a/app/routes/application.js b/app/routes/application.js
index 457deb75..e974ebda 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -2,7 +2,6 @@ import TravisRoute from 'travis/routes/basic';
 import config from 'travis/config/environment';
 import BuildFaviconMixin from 'travis/mixins/build-favicon';
 import Ember from 'ember';
-import getOwner from 'ember-getowner-polyfill';
 
 export default TravisRoute.extend(BuildFaviconMixin, {
   needsAuth: false,
diff --git a/app/routes/getting-started.js b/app/routes/getting-started.js
index 09b265f3..157f7a0b 100644
--- a/app/routes/getting-started.js
+++ b/app/routes/getting-started.js
@@ -1,6 +1,5 @@
 import TravisRoute from 'travis/routes/basic';
 import Ember from 'ember';
-import getOwner from 'ember-getowner-polyfill';
 
 export default TravisRoute.extend({
   setupController(controller) {
diff --git a/app/routes/main.js b/app/routes/main.js
index 687d742c..e791ab2d 100644
--- a/app/routes/main.js
+++ b/app/routes/main.js
@@ -1,6 +1,5 @@
 import TravisRoute from 'travis/routes/basic';
 import config from 'travis/config/environment';
-import getOwner from 'ember-getowner-polyfill';
 
 export default TravisRoute.extend({
   renderTemplate() {
diff --git a/app/routes/simple-layout.js b/app/routes/simple-layout.js
index 35a98d87..3f78e323 100644
--- a/app/routes/simple-layout.js
+++ b/app/routes/simple-layout.js
@@ -1,5 +1,4 @@
 import TravisRoute from 'travis/routes/basic';
-import getOwner from 'ember-getowner-polyfill';
 
 export default TravisRoute.extend({
   setupController: function() {
diff --git a/app/services/ajax.js b/app/services/ajax.js
index 711bb678..420f623e 100644
--- a/app/services/ajax.js
+++ b/app/services/ajax.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import config from 'travis/config/environment';
-import getOwner from 'ember-getowner-polyfill';
 var default_options;
 
 jQuery.support.cors = true;
diff --git a/app/services/auth.js b/app/services/auth.js
index 5aff35cd..ffdfced7 100644
--- a/app/services/auth.js
+++ b/app/services/auth.js
@@ -1,5 +1,4 @@
 import config from 'travis/config/environment';
-import getOwner from 'ember-getowner-polyfill';
 import Ember from 'ember';
 
 export default Ember.Service.extend({
diff --git a/app/utils/urls.js b/app/utils/urls.js
index 12aa2dc7..4d793c44 100644
--- a/app/utils/urls.js
+++ b/app/utils/urls.js
@@ -1,6 +1,6 @@
 import config from 'travis/config/environment';
 import Ember from 'ember';
-import getOwner from 'ember-getowner-polyfill';
+
 var ccXml, email, githubAdmin, githubCommit, githubNetwork, githubPullRequest,
     githubRepo, githubWatchers, gravatarImage, plainTextLog, statusImage;
 
diff --git a/tests/integration/components/add-env-var-test.js b/tests/integration/components/add-env-var-test.js
index 4ccaf530..deb15c16 100644
--- a/tests/integration/components/add-env-var-test.js
+++ b/tests/integration/components/add-env-var-test.js
@@ -3,7 +3,6 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import fillIn from '../../helpers/fill-in';
 import DS from 'ember-data';
-import getOwner from 'ember-getowner-polyfill';
 
 moduleForComponent('add-env-var', 'Integration | Component | add env-var', {
   integration: true
diff --git a/tests/integration/components/add-ssh-key-test.js b/tests/integration/components/add-ssh-key-test.js
index e7c4d8df..d10e7891 100644
--- a/tests/integration/components/add-ssh-key-test.js
+++ b/tests/integration/components/add-ssh-key-test.js
@@ -3,7 +3,6 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import fillIn from '../../helpers/fill-in';
 import DS from 'ember-data';
-import getOwner from 'ember-getowner-polyfill';
 
 moduleForComponent('add-ssh-key', 'Integration | Component | add ssh-key', {
   integration: true
diff --git a/tests/integration/components/env-var-test.js b/tests/integration/components/env-var-test.js
index 808e99ed..2c57ea49 100644
--- a/tests/integration/components/env-var-test.js
+++ b/tests/integration/components/env-var-test.js
@@ -3,7 +3,6 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import fillIn from '../../helpers/fill-in';
 import DS from 'ember-data';
-import getOwner from 'ember-getowner-polyfill';
 
 moduleForComponent('env-var', 'Integration | Component | env-var', {
   integration: true
diff --git a/tests/integration/components/ssh-key-test.js b/tests/integration/components/ssh-key-test.js
index 4b08fdc1..223b31b5 100644
--- a/tests/integration/components/ssh-key-test.js
+++ b/tests/integration/components/ssh-key-test.js
@@ -2,7 +2,6 @@ import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import fillIn from '../../helpers/fill-in';
-import getOwner from 'ember-getowner-polyfill';
 
 moduleForComponent('ssh-key', 'Integration | Component | ssh-key', {
   integration: true