Merge "Revert "Revert "Flip off use of old Chooser targets by default."""