CB-5509 Remove ability to set default target