Boris Johnson ends comeback bid — but promises another