diff --git a/inject.js b/inject.js
index 3ef0751..6ae981e 100644
--- a/inject.js
+++ b/inject.js
@@ -25,21 +25,7 @@ chrome.runtime.sendMessage({}, function(response) {
     }
   };
 
-  // Keep settings as we transition to storage.sync.
-  // Copy settings from chrome.storage.local to chrome.storage.sync
-  // and clear the contents of chrome.storage.local.
-  chrome.storage.local.get(null, function(storage){
-    function is_empty(obj) {
-      return Object.keys(obj).length === 0 && obj.constructor === Object
-    }
-
-    if (!is_empty(storage)) {
-      chrome.storage.sync.set(storage);
-      chrome.storage.local.clear();
-    }
-  });
-
-  chrome.storage.sync.get(tc.settings, function(storage) {
+  chrome.storage.local.get(tc.settings, function(storage) {
     tc.settings.speed = Number(storage.speed);
     tc.settings.resetSpeed = Number(storage.resetSpeed);
     tc.settings.speedStep = Number(storage.speedStep);
@@ -89,7 +75,7 @@ chrome.runtime.sendMessage({}, function(response) {
           var speed = this.getSpeed();
           this.speedIndicator.textContent = speed;
           tc.settings.speed = speed;
-          chrome.storage.sync.set({'speed': speed}, function() {
+          chrome.storage.local.set({'speed': speed}, function() {
             console.log('Speed setting saved: ' + speed);
           });
         }
@@ -406,7 +392,7 @@ chrome.runtime.sendMessage({}, function(response) {
       v.playbackRate = tc.settings.resetSpeed;
     } else {
       tc.settings.resetSpeed = v.playbackRate;
-      chrome.storage.sync.set({'resetSpeed': v.playbackRate});
+      chrome.storage.local.set({'resetSpeed': v.playbackRate});
       v.playbackRate = target;
     }
   }
diff --git a/options.js b/options.js
index b3b5794..66a6b05 100644
--- a/options.js
+++ b/options.js
@@ -124,7 +124,7 @@ function save_options() {
   fastKeyCode   = isNaN(fastKeyCode) ? tcDefaults.fastKeyCode : fastKeyCode;
   displayKeyCode = isNaN(displayKeyCode) ? tcDefaults.displayKeyCode : displayKeyCode;
 
-  chrome.storage.sync.set({
+  chrome.storage.local.set({
     speedStep:      speedStep,
     rewindTime:     rewindTime,
     advanceTime:    advanceTime,
@@ -151,7 +151,7 @@ function save_options() {
 
 // Restores options from chrome.storage
 function restore_options() {
-  chrome.storage.sync.get(tcDefaults, function(storage) {
+  chrome.storage.local.get(tcDefaults, function(storage) {
     document.getElementById('speedStep').value = storage.speedStep.toFixed(2);
     document.getElementById('rewindTime').value = storage.rewindTime;
     document.getElementById('advanceTime').value = storage.advanceTime;
@@ -170,7 +170,7 @@ function restore_options() {
 }
 
 function restore_defaults() {
-  chrome.storage.sync.set(tcDefaults, function() {
+  chrome.storage.local.set(tcDefaults, function() {
     restore_options();
     // Update status to let user know options were saved.
     var status = document.getElementById('status');