Revert HXP.choose, Fix #318