diff --git a/Makefile.rules b/Makefile.rules
index 7dba29c..50f8285 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -150,14 +150,8 @@
 
 # If ENABLE_ASSERTIONS=1 is specified (make command line or configured),
 # then adjust the CONFIGURATION name appropriately (to match LLVM makefiles)
-ifdef ENABLE_ASSERTIONS
-  ifdef ENABLE_OPTIMIZED
-  CONFIGURATION := $(CONFIGURATION)+Asserts
-  endif
-else
-  ifndef ENABLE_OPTIMIZED
+ifdef DISABLE_ASSERTIONS
   CONFIGURATION := $(CONFIGURATION)-Asserts
-  endif
 endif
 
 #