there is a very simple solution. Do not re-open the old bug, but open a new one an reference the former. Much simpler than adapting many things in many places.
but you can also remove the end date/time on the root token an place it somewhere in a node. I have no example code for this, but if you dig a little into the testcases in the source, you probably find some info