diff --git a/app/Cargo.toml b/app/Cargo.toml
index 69d5521314..4a4014b54a 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -469,7 +469,6 @@ default = [
     "render_continuous_block_selections_with_single_border",
     "settings_import",
     "shared_with_me",
-    "block_toolbelt_save_as_workflow",
     "session_sharing_acls",
     "external_agent_mode_context",
     "shell_selector",
@@ -787,7 +786,6 @@ ai_rules = []
 am_workflows = []
 shell_selector = []
 shared_session_long_running_commands = []
-block_toolbelt_save_as_workflow = []
 blocklist_markdown_table_rendering = []
 blocklist_markdown_images = []
 minimalist_ui = []
diff --git a/app/src/lib.rs b/app/src/lib.rs
index 2205a990de..6c5922ed0e 100644
--- a/app/src/lib.rs
+++ b/app/src/lib.rs
@@ -2517,8 +2517,6 @@ pub fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::SSHTmuxWrapper,
         #[cfg(feature = "shell_selector")]
         FeatureFlag::ShellSelector,
-        #[cfg(feature = "block_toolbelt_save_as_workflow")]
-        FeatureFlag::BlockToolbeltSaveAsWorkflow,
         #[cfg(feature = "integration_command")]
         FeatureFlag::IntegrationCommand,
         #[cfg(feature = "artifact_command")]
diff --git a/app/src/terminal/block_list_element.rs b/app/src/terminal/block_list_element.rs
index 49ba40c569..780694fb2a 100644
--- a/app/src/terminal/block_list_element.rs
+++ b/app/src/terminal/block_list_element.rs
@@ -1201,9 +1201,7 @@ impl BlockListElement {
             self.ask_ai_assistant_button = Some(element);
         }
 
-        if FeatureFlag::BlockToolbeltSaveAsWorkflow.is_enabled()
-            && WarpDriveSettings::is_warp_drive_enabled(app)
-        {
+        if WarpDriveSettings::is_warp_drive_enabled(app) {
             let icon = Container::new(
                 ConstrainedBox::new(
                     ui_components::icons::Icon::Save
@@ -4189,12 +4187,9 @@ impl Element for BlockListElement {
                             ask_ai_assistant_button.paint(ask_ai_assistant_button_origin, ctx, app);
                         }
 
-                        if FeatureFlag::BlockToolbeltSaveAsWorkflow.is_enabled() {
-                            if let Some(save_as_workflow_button) =
-                                self.save_as_workflow_button.as_mut()
-                            {
-                                save_as_workflow_button.paint(bookmark_button_origin, ctx, app);
-                            }
+                        if let Some(save_as_workflow_button) = self.save_as_workflow_button.as_mut()
+                        {
+                            save_as_workflow_button.paint(bookmark_button_origin, ctx, app);
                         }
                     }
 
@@ -4203,15 +4198,6 @@ impl Element for BlockListElement {
                         filter_element.paint(filter_button_origin, ctx, app);
                     }
 
-                    if !FeatureFlag::BlockToolbeltSaveAsWorkflow.is_enabled() {
-                        // When a block is bookmarked, we want the bookmark icon to show even when the block is not hovered over.
-                        if let Some(bookmark_element) = self.bookmark_elements.get_mut(block_index)
-                        {
-                            // Paint the bookmark icon to the left of the overflow button.
-                            bookmark_element.paint(bookmark_button_origin, ctx, app);
-                        }
-                    }
-
                     // Paint the CLI subagent view on top of everything else for this block
                     let mut render_params = CLISubagentRenderParams {
                         block_id: block.id().clone(),
diff --git a/crates/warp_features/src/lib.rs b/crates/warp_features/src/lib.rs
index 5ee39a6900..de97beea58 100644
--- a/crates/warp_features/src/lib.rs
+++ b/crates/warp_features/src/lib.rs
@@ -149,9 +149,6 @@ pub enum FeatureFlag {
     /// Enables writing to long-running commands in shared sessions.
     SharedSessionWriteToLongRunningCommands,
 
-    /// Replaces the bookmark button with a "save as workflow" button.
-    BlockToolbeltSaveAsWorkflow,
-
     /// Lazily builds scenes at render time instead of eagerly when a view
     /// changes.
     LazySceneBuilding,