This is consistent with the current implementation in ManualControl.  Once that changes this should change to model that.