Backport braintree#cancel fix to 2-3