diff --git a/cmake/zephyr/Kconfig b/cmake/zephyr/Kconfig
index 643f1084..77791971 100644
--- a/cmake/zephyr/Kconfig
+++ b/cmake/zephyr/Kconfig
@@ -4,7 +4,7 @@ config TOOLCHAIN_ZEPHYR_0_17
 	def_bool y
 	# FIXME: Newlib-nano is disabled for Xtensa targets due to the memset
         #        bug causing crashes (see the GitHub issue #660).
-	select HAS_NEWLIB_LIBC_NANO if !XTENSA
+	#select HAS_NEWLIB_LIBC_NANO if !XTENSA
 
 config TOOLCHAIN_ZEPHYR_SUPPORTS_THREAD_LOCAL_STORAGE
 	def_bool y
diff --git a/configs/common.config b/configs/common.config
index ae00e57b..34886931 100644
--- a/configs/common.config
+++ b/configs/common.config
@@ -39,7 +39,7 @@ CT_LIBC_NEWLIB_RETARGETABLE_LOCKING=y
 CT_LIBC_NEWLIB_EXTRA_SECTIONS=y
 
 # Newlib-nano
-CT_COMP_LIBS_NEWLIB_NANO=y
+CT_COMP_LIBS_NEWLIB_NANO=n
 CT_NEWLIB_NANO_SRC_CUSTOM=y
 CT_NEWLIB_NANO_CUSTOM_LOCATION="${GITHUB_WORKSPACE}/newlib"
 CT_NEWLIB_NANO_GCC_LIBSTDCXX=y