 			change = @changesTracker.getChange(change_id)
 			return if !change?
 			@changesTracker.removeChangeId(change_id)
-			is_tracking = @changesTracker.track_changes
-			@changesTracker.track_changes = false
+			@dont_track_next_update = true
 			session = @editor.getSession()
 			if change.op.d?
 				content = change.op.d

								@nextUpdateMetaData = null
						else
							user_id = window.user.id

						@applyChange(e, { user_id })
						
						# TODO: Just for debugging, remove before going live.
						setTimeout () =>

				session.remove({start, end})
			else
				throw new Error("unknown change: #{JSON.stringify(change)}")


		checkMapping: () ->
			session = @editor.getSession()
