diff --git a/UPGRADE-13.txt b/UPGRADE-13.txt
index bc61ab6548..0599755aa7 100644
--- a/UPGRADE-13.txt
+++ b/UPGRADE-13.txt
@@ -66,6 +66,12 @@ ConfBridge:
   new method to achieve this functionality is by using sound_begin to play
   a sound to the conference when waitmarked users are moved into the conference.
 
+ControlPlayback:
+ - The ControlPlayback and 'control stream file' AGI command will no longer
+   implicitly answer the channel. If you do not answer the channel prior to
+   using either this application or AGI command, you must send Progress
+   first.
+
 Queue:
  - Queue rules provided in queuerules.conf can no longer be named "general".
 
diff --git a/main/app.c b/main/app.c
index 89f5f77c17..82237479cb 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1046,9 +1046,6 @@ static int control_streamfile(struct ast_channel *chan,
 			strcat(breaks, restart);
 		}
 	}
-	if (ast_channel_state(chan) != AST_STATE_UP) {
-		res = ast_answer(chan);
-	}
 
 	if ((end = strchr(file, ':'))) {
 		if (!strcasecmp(end, ":end")) {