--- a/configure.ac
+++ b/configure.ac
@@ -3598,13 +3598,7 @@
 fi
 
 if test "$enable_trail_grades" = yes; then
-    LIBGRADES="$LIBGRADES $DEFAULT_BASE_GRADE.gc.tr"
-    if test $DEFAULT_BASE_GRADE = hlc; then
-        LIBGRADES="$LIBGRADES $BEST_LLDS_BASE_GRADE.gc.debug.tr.stseg"
-    else
-        # $DEFAULT_BASE_GRADE must be an LLDS grade
-        LIBGRADES="$LIBGRADES $DEFAULT_BASE_GRADE.gc.debug.tr.stseg hlc.gc.tr"
-    fi
+    LIBGRADES="$LIBGRADES $BEST_LLDS_BASE_GRADE.gc.tr hlc.gc.tr"
     if test "$enable_inefficient_grades" = yes; then
         if test "$enable_nogc_grades" = yes; then
             LIBGRADES="$LIBGRADES $DEFAULT_BASE_GRADE.tr"
@@ -3645,7 +3639,6 @@
 # By default, we also use stack segments in debugging grades.
 #
 if test "$enable_debug_grades" = yes; then
-    LIBGRADES="$LIBGRADES $BEST_DEBUG_BASE_GRADE.gc.debug.stseg"
     if test "$enable_decl_debug_grades" = yes; then
         LIBGRADES="$LIBGRADES $BEST_DEBUG_BASE_GRADE.gc.decldebug.stseg"
     fi
