Automatic plan branch creation fails when re-creating a branch that has been previously deleted

With stash/bamboo applications links configured, and bamboo use automatic branch creation, the following steps fail:

1. Create a new branch, 'test'
2. Bamboo creates a plan for the 'test' branch, and builds it
3. Delete the 'test' branch in stash
4. Bamboo disables the test branch plan
5. Create a branch called 'test' in stash again

Expected: 'test' branch is re-enabled
Actual: Bamboo logs have an exception:

2014-07-29 22:53:04,976 INFO [http-6990-31] [AccessLogFilter] 10.1.1.250 POST http://pear.home:6990/bamboo/rest/remote-event-consumer/latest/events/stash-branch-created-remote-event 76458kb
2014-07-29 22:53:05,006 ERROR [AtlassianEvent::0-BAM::EVENTS:pool-1-thread-7] [AsynchronousAbleEventDispatcher] There was an exception thrown trying to dispatch event 'com.atlassian.stash.pl
ugin.remote.event.StashBranchCreatedRemoteEvent@303bcb6b[branchName=test1,repositoryProject=TEST,repositorySlug=test,committer=admin,sourceId=1041209f-b842-3d23-b1ed-0c22aaa2e1ba,sourceUrl=h
ttp://pear.home:7990/stash]' from the invoker 'SingleParameterMethodListenerInvoker

{method=public void com.atlassian.bamboo.plugins.stash.events.BranchCreatedEventListener.onCreateRepository BranchEvent(com.atlassian.stash.plugin.remote.event.StashBranchCreatedRemoteEvent), listener=com.atlassian.bamboo.plugins.stash.events.BranchCreatedEventListener@878319f}

'.
java.lang.RuntimeException: Invalid parameters while trying to create new branch test1 for plan TEST-TEST. Error: branchName: [This name is already used in a branch or plan.]
at com.atlassian.event.internal.SingleParameterMethodListenerInvoker.invoke(SingleParameterMethodListenerInvoker.java:54)
at com.atlassian.event.internal.AsynchronousAbleEventDispatcher$2.run(AsynchronousAbleEventDispatcher.java:66)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at com.atlassian.bamboo.utils.BambooRunnables$1.run(BambooRunnables.java:49)
at com.atlassian.bamboo.security.ImpersonationHelper.runWith(ImpersonationHelper.java:31)
at com.atlassian.bamboo.security.ImpersonationHelper.runWithSystemAuthority(ImpersonationHelper.java:20)
at com.atlassian.bamboo.security.ImpersonationHelper$1.run(ImpersonationHelper.java:52)
at java.lang.Thread.run(Thread.java:745)
Caused by: java.security.InvalidParameterException: Invalid parameters while trying to create new branch test1 for plan TEST-TEST. Error: branchName: [This name is already used in a branch or plan.]
at com.atlassian.bamboo.plan.branch.BranchDetectionServiceImpl.createChainBranch(BranchDetectionServiceImpl.java:798)
at sun.reflect.GeneratedMethodAccessor1651.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
....