diff --git a/.cargo/config b/.cargo/config
index 42399c1716a867e56f3e536771e75ccaea043e1b..4efa883590998861a5e5421f6633c99ee7eccb71 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,6 +1,6 @@
 [unstable]
 build-std = ["core", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
+build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]
 
 [build]
 target = "x86_64-unknown-hermit-kernel"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f8303fd777d31c4ac043f3bfbf03e7ac4f8c636..1f1cad86c937991ebe055b388b82d93cd732bf95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,22 +84,6 @@ add_custom_command(
 	COMMAND
 		${CMAKE_ELFEDIT} --output-osabi Standalone $<TARGET_FILE:hermit-bootstrap>
 
-	# rename basic functions like memcpy to avoid collisions with the user space
-	COMMAND
-		${CMAKE_OBJCOPY} --redefine-sym memmove=kernel_memmove $<TARGET_FILE:hermit-bootstrap>
-
-	COMMAND
-		${CMAKE_OBJCOPY} --redefine-sym memcpy=kernel_memcpy $<TARGET_FILE:hermit-bootstrap>
-
-	COMMAND
-		${CMAKE_OBJCOPY} --redefine-sym memset=kernel_memset $<TARGET_FILE:hermit-bootstrap>
-
-	COMMAND
-		${CMAKE_OBJCOPY} --redefine-sym memcmp=kernel_memcmp $<TARGET_FILE:hermit-bootstrap>
-
-	COMMAND
-		${CMAKE_OBJCOPY} --redefine-sym bcmp=kernel_bcmp $<TARGET_FILE:hermit-bootstrap>
-
 	# Copy libhermit.a into local prefix directory so that all subsequent
 	# targets can link against the freshly built version (as opposed to
 	# linking against the one supplied by the toolchain)