diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index f7ebe2c6e..fd844fb3c 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -711,9 +711,6 @@
     music_label: "Music"
     music_description: "Turn background music on/off."
     editor_config_title: "Editor Configuration"
-    editor_config_keybindings_label: "Key Bindings"
-    editor_config_keybindings_default: "Default (Ace)"
-    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
     editor_config_livecompletion_label: "Live Autocompletion"
     editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
     editor_config_invisibles_label: "Show Invisibles"
diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee
index 3b1799786..625d4b2f0 100644
--- a/app/schemas/models/user.coffee
+++ b/app/schemas/models/user.coffee
@@ -121,7 +121,7 @@ _.extend UserSchema.properties,
 
   aceConfig: c.object { default: { language: 'python', keyBindings: 'default', invisibles: false, indentGuides: false, behaviors: false, liveCompletion: true }},
     language: {type: 'string', 'enum': ['python', 'javascript', 'coffeescript', 'clojure', 'lua', 'java', 'io']}
-    keyBindings: {type: 'string', 'enum': ['default', 'vim', 'emacs']}
+    keyBindings: {type: 'string', 'enum': ['default', 'vim', 'emacs']}  # Deprecated 2016-05-30; now we just always give them 'default'.
     invisibles: {type: 'boolean' }
     indentGuides: {type: 'boolean' }
     behaviors: {type: 'boolean' }
@@ -337,7 +337,7 @@ _.extend UserSchema.properties,
     }
   }
   enrollmentRequestSent: { type: 'boolean' }
-  
+
   schoolName: {type: 'string'}
   role: {type: 'string', enum: ["God", "advisor", "parent", "principal", "student", "superintendent", "teacher", "technology coordinator"]}
   birthday: c.stringDate({title: "Birthday"})
diff --git a/app/templates/play/menu/options-view.jade b/app/templates/play/menu/options-view.jade
index 451d960df..ad4126e08 100644
--- a/app/templates/play/menu/options-view.jade
+++ b/app/templates/play/menu/options-view.jade
@@ -26,14 +26,6 @@
 
   h3(data-i18n="options.editor_config_title") Editor Configuration
   
-  .form-group.select-group
-    label.control-label(for="option-key-bindings", data-i18n="options.editor_config_keybindings_label") Key Bindings
-    select#option-key-bindings.form-control(name="keyBindings")
-      option(value="default", selected=(aceConfig.keyBindings === "default"), data-i18n="options.editor_config_keybindings_default") Default (Ace)
-      option(value="vim", selected=(aceConfig.keyBindings === "vim")) Vim
-      option(value="emacs", selected=(aceConfig.keyBindings === "emacs")) Emacs
-    span.help-block(data-i18n="options.editor_config_keybindings_description") Adds additional shortcuts known from the common editors.
-  
   .form-group.checkbox
     label(for="option-live-completion")
       input#option-live-completion(name="liveCompletion", type="checkbox", checked=aceConfig.liveCompletion)
diff --git a/app/views/play/menu/OptionsView.coffee b/app/views/play/menu/OptionsView.coffee
index 205057065..5bd6285e4 100644
--- a/app/views/play/menu/OptionsView.coffee
+++ b/app/views/play/menu/OptionsView.coffee
@@ -20,8 +20,7 @@ module.exports = class OptionsView extends CocoView
 
   events:
     'change #option-music': 'updateMusic'
-    'change #option-key-bindings': 'updateInvisibles'
-    'change #option-key-bindings': 'updateKeyBindings'
+    'change #option-invisibles': 'updateInvisibles'
     'change #option-indent-guides': 'updateIndentGuides'
     'change #option-behaviors': 'updateBehaviors'
     'change #option-live-completion': 'updateLiveCompletion'
@@ -67,7 +66,7 @@ module.exports = class OptionsView extends CocoView
     if @playerName and @playerName isnt me.get('name')
       me.set 'name', @playerName
     @aceConfig.invisibles = @$el.find('#option-invisibles').prop('checked')
-    @aceConfig.keyBindings = @$el.find('#option-key-bindings').val()
+    @aceConfig.keyBindings = 'default'  # We used to give them the option, but we took it away.
     @aceConfig.indentGuides = @$el.find('#option-indent-guides').prop('checked')
     @aceConfig.behaviors = @$el.find('#option-behaviors').prop('checked')
     @aceConfig.liveCompletion = @$el.find('#option-live-completion').prop('checked')