diff --git a/Makefile b/Makefile
index d77872fca..48f96e4b7 100644
--- a/Makefile
+++ b/Makefile
@@ -988,11 +988,10 @@ else
 endif
 
 IS_DEV_OR_DEBUG := $(or $(filter 1,$(DEVELOPMENT)),$(filter 1,$(DEBUG)),0)
-# causes a lot of issues
-# ifeq ($(IS_DEV_OR_DEBUG),0)
-#   CFLAGS += -fno-ident -fno-common -fno-asynchronous-unwind-tables -ffile-prefix-map=$(PWD)=. -D__DATE__="\"\"" -D__TIME__="\"\"" -Wno-builtin-macro-redefined
-#   LDFLAGS += -Wl,--build-id=none
-# endif
+ifeq ($(IS_DEV_OR_DEBUG),0)
+  CFLAGS += -fno-ident -fno-common -ffile-prefix-map=$(PWD)=. -D__DATE__="\"\"" -D__TIME__="\"\"" -Wno-builtin-macro-redefined
+  LDFLAGS += -Wl,--build-id=none
+endif
 
 # Prevent a crash with -sopt
 export LANG := C