KAZOO-2316: Fix whistle services spamming braintree

Review carefully!