diff --git a/src/riot-rs-embassy/Cargo.toml b/src/riot-rs-embassy/Cargo.toml
index 9c7c70700..9abb92afb 100644
--- a/src/riot-rs-embassy/Cargo.toml
+++ b/src/riot-rs-embassy/Cargo.toml
@@ -103,7 +103,7 @@ wifi = []
 wifi-cyw43 = ["riot-rs-rp/wifi-cyw43", "net", "wifi"]
 wifi-esp = ["riot-rs-esp/wifi-esp", "net", "wifi"]
 
-threading = ["dep:riot-rs-threads", "riot-rs-esp/threading"]
+threading = ["dep:riot-rs-threads"]
 override-network-config = []
 override-usb-config = []
 
diff --git a/src/riot-rs-esp/Cargo.toml b/src/riot-rs-esp/Cargo.toml
index d8b423097..4ae5fd8aa 100644
--- a/src/riot-rs-esp/Cargo.toml
+++ b/src/riot-rs-esp/Cargo.toml
@@ -81,9 +81,6 @@ spi = ["dep:fugit", "riot-rs-embassy-common/spi"]
 ## Enables defmt support.
 defmt = ["dep:defmt", "esp-wifi?/defmt", "fugit?/defmt"]
 
-## Enables threading support.
-threading = []
-
 ## Enables Wi-Fi support.
 wifi = []
 
diff --git a/src/riot-rs-esp/src/lib.rs b/src/riot-rs-esp/src/lib.rs
index 7fe1f0922..bdafd6ae8 100644
--- a/src/riot-rs-esp/src/lib.rs
+++ b/src/riot-rs-esp/src/lib.rs
@@ -68,20 +68,6 @@ pub use esp_hal_embassy::Executor;
 pub fn init() -> OptionalPeripherals {
     let mut peripherals = OptionalPeripherals::from(esp_hal::init(esp_hal::Config::default()));
 
-    #[cfg(feature = "threading")]
-    {
-        use esp_hal::{interrupt, peripherals::Interrupt};
-        // Since https://github.com/esp-rs/esp-hal/pull/2091,
-        // `esp_hal::init()` resets all interrupts.
-        // That also disables our scheduler interrupt, which was previously enabled
-        // in `riot_rs_threads::arch::xtensa`.
-        // So, re-enable it here.
-
-        // Panics if `FROM_CPU_INTR0` is among `esp_hal::interrupt::RESERVED_INTERRUPTS`,
-        // which isn't the case.
-        interrupt::enable(Interrupt::FROM_CPU_INTR0, interrupt::Priority::min()).unwrap();
-    }
-
     #[cfg(feature = "wifi-esp")]
     {
         use esp_hal::timer::timg::TimerGroup;