diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 4a77a13b97..f770b9b459 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -791,9 +791,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 		PendingDeclickIn   = 0x1,
 		PendingDeclickOut  = 0x2,
 		StopPendingCapture = 0x4,
-		AutoReturning      = 0x10,
 		PendingLocate      = 0x20,
-		PendingSetLoop     = 0x40
 	};
 
 	/* stuff used in process() should be close together to
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 7c00538e44..c73677a932 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -246,7 +246,7 @@ Session::realtime_stop (bool abort, bool clear_state)
 		waiting_for_sync_offset = true;
 	}
 
-	transport_sub_state = ((!config.get_external_sync()&& config.get_auto_return()) ? AutoReturning : 0);
+	transport_sub_state = 0;
 }
 
 void