Undo fix for #2185: sparks really should be treated as roots