Restore some of the manager conditional. My changes broke normal switchng and its intent is covered in the aggressiveness changes. #1230
Restore some of the manager conditional. My changes broke normal switchng and its intent is covered in the aggressiveness changes. #1230