diff --git a/ChangeLog b/ChangeLog
index 5907112fb..0f8bc93e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-25  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 40644: Src/Modules/parameter.c, Test/V06parameter.ztst:
+	Revert 40626 which broke tests.
+
 2017-02-25  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 40640 (plus doc typo fixed): Doc/Zsh/expn.yo, Src/subst.c: the
@@ -10,7 +15,7 @@
 	to the completion.
 
 	* 40626: Src/Modules/parameter.c, Test/V06parameter.ztst:
-	Make $options re-settable.
+	Make $options re-settable.  [reverted in 40644]
 
 2017-02-23  Barton E. Schaefer  <schaefer@zsh.org>
 
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index c7aac88d1..c251e4f97 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -937,7 +937,7 @@ unsetpmoption(Param pm, UNUSED(int exp))
 
 /**/
 static void
-setpmoptions(Param pm, HashTable ht)
+setpmoptions(UNUSED(Param pm), HashTable ht)
 {
     int i;
     HashNode hn;
@@ -962,7 +962,7 @@ setpmoptions(Param pm, HashTable ht)
 			      (val && strcmp(val, "off")), 0, opts))
 		zwarn("can't change option: %s", hn->nam);
 	}
-    hashsetfn(pm, ht);
+    deleteparamtable(ht);
 }
 
 static const struct gsu_scalar pmoption_gsu =
diff --git a/Test/V06parameter.ztst b/Test/V06parameter.ztst
index 2b6671300..27d587852 100644
--- a/Test/V06parameter.ztst
+++ b/Test/V06parameter.ztst
@@ -92,9 +92,6 @@
 >foo
 >bar
 
- options+=(); options+=()
-0:$options can be appended to twice
-
 %clean
 
  rm -f autofn functrace.zsh rocky3.zsh sourcedfile myfunc