diff --git a/[refs] b/[refs]
index 5908ca6e6538..c0bbe9e454ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aeebe01cb2ba1bca4cd9b8a6e77386bd7499dc2
+refs/heads/master: 4c2645830e29c082217662e7486572e9637e9f1d
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.
  	 */