follow-up fix to ede2c9f28dd5 optimization.  for all I know, this fix nerfs the delicate branch optimization, BUT there was a real crash there. :/ (transplanted from e13b292907c5c208e0c96de73b80e203412c5c33)
follow-up fix to ede2c9f28dd5 optimization.  for all I know, this fix nerfs the delicate branch optimization, BUT there was a real crash there. :/
(transplanted from e13b292907c5c208e0c96de73b80e203412c5c33)

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm