Implement the killswitch at the correct point in the time space continuum
Updates #26117