diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 04aa8d523..2eb241a89 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -33,11 +33,10 @@ class EditSession
   anchorRanges: null
   cursors: null
   selections: null
-  autoIndent: false # TODO: re-enabled auto-indent after fixing the rest of tokenization
   softTabs: true
   softWrap: false
 
-  constructor: ({@project, @buffer, tabLength, @autoIndent, softTabs, @softWrap }) ->
+  constructor: ({@project, @buffer, tabLength, softTabs, @softWrap }) ->
     @softTabs = @buffer.usesSoftTabs() ? softTabs ? true
     @languageMode = new LanguageMode(this, @buffer.getExtension())
     @displayBuffer = new DisplayBuffer(@buffer, { @languageMode, tabLength })
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 5a67ef28e..651811574 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -80,7 +80,6 @@ class Editor extends View
         buffer: new Buffer()
         softWrap: false
         tabLength: 2
-        autoIndent: false
         softTabs: true
 
       @editSessions.push editSession
diff --git a/src/app/project.coffee b/src/app/project.coffee
index d49a1dae9..82d2f18dd 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -16,7 +16,6 @@ class Project
     new Project(state.path, state.grammarOverridesByPath)
 
   tabLength: 2
-  autoIndent: true
   softTabs: true
   softWrap: false
   rootDirectory: null
@@ -91,9 +90,6 @@ class Project
   relativize: (fullPath) ->
     fullPath.replace(@getPath(), "").replace(/^\//, '')
 
-  getAutoIndent: -> @autoIndent
-  setAutoIndent: (@autoIndent) ->
-
   getSoftTabs: -> @softTabs
   setSoftTabs: (@softTabs) ->
 
@@ -114,7 +110,6 @@ class Project
 
   defaultEditSessionOptions: ->
     tabLength: @tabLength
-    autoIndent: @getAutoIndent()
     softTabs: @getSoftTabs()
     softWrap: @getSoftWrap()