diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index c6f9096329..0c00e1ede9 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1212,7 +1212,6 @@ public:
 	enum PostTransportWork {
 		PostTransportStop               = 0x1,
 		PostTransportLocate             = 0x2,
-		PostTransportRoll               = 0x4,
 		PostTransportAbort              = 0x8,
 		PostTransportOverWrite          = 0x10,
 		PostTransportAudition           = 0x20,
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 2ed9535e71..a8b248b7de 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -482,7 +482,6 @@ setup_enum_writer ()
 
 	REGISTER_CLASS_ENUM (Session, PostTransportStop);
 	REGISTER_CLASS_ENUM (Session, PostTransportLocate);
-	REGISTER_CLASS_ENUM (Session, PostTransportRoll);
 	REGISTER_CLASS_ENUM (Session, PostTransportAbort);
 	REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
 	REGISTER_CLASS_ENUM (Session, PostTransportAudition);
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 04543d4fef..c5057f4e86 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -281,11 +281,6 @@ Session::locate (samplepos_t target_sample, bool with_roll, bool for_loop_end, b
 	if (force || !for_loop_end) {
 
 		PostTransportWork todo = PostTransportLocate;
-
-		if (with_roll && transport_was_stopped) {
-			todo = PostTransportWork (todo | PostTransportRoll);
-		}
-
 		add_post_transport_work (todo);
 		need_butler = true;
 
@@ -650,7 +645,7 @@ Session::should_roll_after_locate () const
 	 * this answer can be considered correct
 	 */
 
-	return ((!config.get_external_sync() && (auto_play_legal && config.get_auto_play())) && !_exporting) || (post_transport_work() & PostTransportRoll);
+	return ((!config.get_external_sync() && (auto_play_legal && config.get_auto_play())) && !_exporting);
 
 }
 
@@ -683,12 +678,6 @@ Session::butler_completed_transport_work ()
 		TFSM_EVENT (TransportFSM::LocateDone);
 	}
 
-	bool start_after_butler_done_msg = false;
-
-	if (ptw & PostTransportRoll) {
-		start_after_butler_done_msg = true;
-	}
-
 	/* the butler finished its work so clear all PostTransportWork flags
 	 */