diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 449ad3ce9..0e9d3eda6 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -584,6 +584,10 @@ describe a couple of isolated moat spots on Samurai quest home level as water
 	rather than as moat
 crawling out of water to avoid drowning didn't work as intended when trying
 	to move diagonally through a tight squeeze
+in wizard mode, polymorphing into hero's role monster in order to revert to
+	normal form would complain about missing light source if hero was
+	changing back from the form of a light-emitting monster [didn't affect
+	normal play because role monsters are invalid polymorph targets there]
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/polyself.c b/src/polyself.c
index fe349bc19..78f620f6c 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -423,7 +423,7 @@ polyself(int psflags)
     old_light = emits_light(g.youmonst.data);
     mntmp = NON_PM;
 
-    if (formrevert){
+    if (formrevert) {
         mntmp = g.youmonst.cham;
         monsterpoly = TRUE;
         controllable_poly = FALSE;
@@ -469,6 +469,7 @@ polyself(int psflags)
                 /* in wizard mode, picking own role while poly'd reverts to
                    normal without newman()'s chance of level or sex change */
                 rehumanize();
+                old_light = 0; /* rehumanize() extinguishes u-as-mon light */
                 goto made_change;
             } else if (iswere && (were_beastie(mntmp) == u.ulycn
                                   || mntmp == counter_were(u.ulycn)