diff --git a/common/src/lib.rs b/common/src/lib.rs
index 904465567b..3d65a743a4 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -7,7 +7,6 @@
     allocator_api,
     array_chunks,
     associated_type_defaults,
-    bool_to_option,
     coerce_unsized,
     dispatch_from_dyn,
     exclusive_wrapper,
diff --git a/common/systems/src/lib.rs b/common/systems/src/lib.rs
index a88b20b9b9..05fab14477 100644
--- a/common/systems/src/lib.rs
+++ b/common/systems/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(bool_to_option, let_else, btree_drain_filter)]
+#![feature(let_else, btree_drain_filter)]
 #![allow(clippy::option_map_unit_fn)]
 
 mod aura;
diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs
index 5c34a0161d..5b81d2d68a 100644
--- a/server-cli/src/main.rs
+++ b/server-cli/src/main.rs
@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(clippy::clone_on_ref_ptr)]
-#![feature(bool_to_option)]
 
 #[cfg(target_os = "windows")]
 #[global_allocator]
diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
index 0ebcedb712..e04c9062f1 100644
--- a/voxygen/src/lib.rs
+++ b/voxygen/src/lib.rs
@@ -7,7 +7,6 @@
     array_methods,
     array_windows,
     array_zip,
-    bool_to_option,
     drain_filter,
     once_cell,
     stmt_expr_attributes,
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index ee1bb2f3cf..e475988e41 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -1547,9 +1547,9 @@ impl/*<V: RectRasterableVol>*/ Terrain<V> {
                             frustum_last_plane_index: 0,
                         });
                     } else if let Some(chunk) = self.chunks.get_mut(&pos) {
-                        // There was an update that didn't require a remesh (probably related to
+                        /* // There was an update that didn't require a remesh (probably related to
                         // non-glowing sprites) so we just update those.
-                        renderer.unmap_instances(&mut response.sprite_instances.1);
+                        renderer.unmap_instances(&mut response.sprite_instances.1); */
                         chunk.sprite_instances = response.sprite_instances;
                         chunk.blocks_of_interest = response.blocks_of_interest;
                     } else {
diff --git a/world/src/lib.rs b/world/src/lib.rs
index b1db33b3c3..e28add4dfc 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(
     arbitrary_enum_discriminant,
     associated_const_equality,
-    bool_to_option,
     generic_associated_types,
     label_break_value,
     option_zip,