As a part of this issue we also need to fix a bug that we do not set the AtomicBoolean back to false on deactivation.