diff --git a/gcc/cobol/genutil.cc b/gcc/cobol/genutil.cc
index 6e82bb92fdbc2da6f8c767af760754c6fee2e068..e675bcf054e1d83b0f4895d7e88da9564c68ef85 100644
--- a/gcc/cobol/genutil.cc
+++ b/gcc/cobol/genutil.cc
@@ -2431,12 +2431,7 @@ refer_fill_internal(cbl_refer_t &refer, refer_type_t refer_type)
           refer.field ? refer.field->name : "noname",
           counter++);
 
-  //// Trying to switch the next statement to vs_stack rather than vs_static.
-  //// That's a work in progress; at this time putting these on the stack results
-  //// in intermittent errors.  Apparently such data sometimes, but not always,
-  //// gets lost before it is used.  RJD 2024-04-07
-  refer.refer_decl_node = gg_define_variable(cblc_refer_type_node, ach, vs_static);
-//  refer.refer_decl_node = gg_define_variable(cblc_refer_type_node, ach, vs_stack);
+  refer.refer_decl_node = gg_define_variable(cblc_refer_type_node, ach, vs_stack);
   gg_memset(gg_get_address_of(refer.refer_decl_node),
             integer_zero_node,
             build_int_cst_type(SIZE_T, sizeof(cblc_refer_t)));
@@ -2467,18 +2462,6 @@ refer_fill_internal(cbl_refer_t &refer, refer_type_t refer_type)
         {
         gg_assign(member(refer.refer_decl_node, "qual_data"),
                   gg_cast(UCHAR_P, member(refer.field->var_decl_node, "initial")));
-#if 0
-        if( refer.field->attr & hex_encoded_e )
-          {
-          gg_assign(member(refer.refer_decl_node, "qual_size"),
-                    build_int_cst_type(SIZE_T, refer.field->data.capacity));
-          }
-        else
-          {
-          gg_assign(member(refer.refer_decl_node, "qual_size"),
-                    build_int_cst_type(SIZE_T, strlen(refer.field->data.initial)));
-          }
-#endif
         gg_assign(member(refer.refer_decl_node, "qual_size"),
                   build_int_cst_type(SIZE_T, refer.field->data.capacity));
         }