KRACOEUS-8458 cleaning up inactivation flag.  This should improve consis...

KRACOEUS-8458 cleaning up inactivation flag.  This should improve consistency, and maybe perf.