Unsquash changes to admin_choice.