Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.87.2.11 -r1.87.2.12
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	27 Feb 2021 22:25:31 -0000	1.87.2.11
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	23 Apr 2021 09:01:31 -0000	1.87.2.12
@@ -790,12 +790,6 @@
 
         template::element create $form_name __refreshing_p -datatype integer -widget hidden -value 0
 
-        #
-        # Add the hidden button element.
-        #
-        template::element create $form_name "__submit_button_name" -datatype text -widget hidden -value ""
-        template::element create $form_name "__submit_button_value" -datatype text -widget hidden -value ""
-
         if {[info exists csrf_protection_p] && $csrf_protection_p} {
             #
             # Add CSRF value to every ad_form. Validation might be
@@ -1101,14 +1095,6 @@
                 uplevel #$level [list set $element_name $value]
             }
         }
-        #
-        # Update the clicked button if it does not already exist.
-        #
-        uplevel #$level {
-            if {[info exists __submit_button_name] && $__submit_button_name ne ""} {
-                set $__submit_button_name $__submit_button_value
-            }
-        }
 
         if { [info exists key_name] } {
             upvar #$level $key_name __key
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.61.2.10 -r1.61.2.11
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	22 Apr 2021 18:47:25 -0000	1.61.2.10
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	23 Apr 2021 09:01:31 -0000	1.61.2.11
@@ -868,11 +868,6 @@
             # This is the value
             set actual_value [ns_set value $form $form_counter_i]
 
-            # This is needed for double click protection so we can access the two variables down below.
-            if {$actual_name eq "__submit_button_name" || $actual_name eq "__submit_button_value"} {
-                set $actual_name $actual_value
-            }
-
             # It may be a signature for another variable
             if { [regexp {^(.*):sig$} $actual_name match formal_name] } {
                 set apc_signatures($formal_name) $actual_value
@@ -1222,16 +1217,6 @@
             }
         }
     }
-
-    # Set the __submit_button_variable. This is used in double click protection.
-    if {[info exists __submit_button_name]
-        && $__submit_button_name ne ""
-        && [info exists __submit_button_value]
-    } {
-        uplevel 1 [list set $__submit_button_name $__submit_button_value]
-    }
-
-
 }
 
 ad_proc -public ad_page_contract_get_variables { } {