diff --git a/[refs] b/[refs]
index 3327afb7589a..8d430b1095fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a225791374dca35bba871a007c78a3d0b14b559
+refs/heads/master: 752a3b79630a290cbbe4731e7c61b75d4fbebc5c
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 1d0759178e4b..e8025b2ec54a 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -149,6 +149,13 @@ static void elevator_setup_default(void)
 	if (!chosen_elevator[0])
 		strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
 
+	/*
+	 * Be backwards-compatible with previous kernels, so users
+	 * won't get the wrong elevator.
+	 */
+	if (!strcmp(chosen_elevator, "as"))
+		strcpy(chosen_elevator, "anticipatory");
+
  	/*
  	 * If the given scheduler is not available, fall back to no-op.
  	 */