diff --git a/src/allocator.rs b/src/allocator.rs
index bd8ebbef0d59a87ddff3720d71c6e56e88aea5c8..fd8704c3403e5bb5780ca2e995398c6a7e6470f6 100644
--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -87,19 +87,3 @@ unsafe impl GlobalAlloc for TockAllocator {
 
 #[global_allocator]
 static ALLOCATOR: TockAllocator = TockAllocator::new();
-
-#[cfg(not(feature = "custom_alloc_error_handler"))]
-#[alloc_error_handler]
-unsafe fn alloc_error_handler(_: Layout) -> ! {
-    use crate::syscalls;
-
-    // Print 0x01 using the LowLevelDebug capsule (if available).
-    let _ = syscalls::command1_insecure(8, 2, 0x01);
-
-    // Signal a panic using the LowLevelDebug capsule (if available).
-    let _ = syscalls::command1_insecure(8, 1, 0x01);
-
-    loop {
-        syscalls::raw::yieldk();
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index edadf4ca6bb182241ecf8f24d3030323cd48edf8..38ddbfeee7af1bf5b8bf60816e39f4408fffbbbf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,8 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#![feature(alloc_error_handler)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[macro_use]