Fixes --donotactivate branch to do what is expected