Re-adding deleted builds (with same name/key) throws 500 error

Result summaries are now NOT unique

net.sf.hibernate.NonUniqueResultException: query did not return a unique result: 3
at net.sf.hibernate.impl.AbstractQueryImpl.uniqueElement(AbstractQueryImpl.java:559)
at net.sf.hibernate.impl.CriteriaImpl.uniqueResult(CriteriaImpl.java:385)
at com.atlassian.bamboo.resultsummary.BuildResultsSummaryHibernateDao.getBuildResultsSummaryByBuildKeyAndBuildNumber(BuildResultsSummaryHibernateDao.java:36)
at com.atlassian.bamboo.resultsummary.BuildResultsSummaryManagerImpl.getBuildResultsSummary(BuildResultsSummaryManagerImpl.java:112)
at com.atlassian.bamboo.resultsummary.BuildResultsSummaryManagerImpl.getBuildResultsSummary(BuildResultsSummaryManagerImpl.java:107)
at sun.reflect.GeneratedMethodAccessor383.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:287)
at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:181)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:148)
at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:96)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:170)
at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:176)
at $Proxy12.getBuildResultsSummary(Unknown Source)
at com.atlassian.bamboo.results.BuildResultsImpl.getBuildResultsSummary(BuildResultsImpl.java:138)
at sun.reflect.GeneratedMethodAccessor382.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at freemarker.ext.beans.BeansWrapper.invokeMethod(BeansWrapper.java:616)
at freemarker.ext.beans.BeanModel.invokeThroughDescriptor(BeanModel.java:271)
at freemarker.ext.beans.BeanModel.get(BeanModel.java:183)
at freemarker.core.Dot._getAsTemplateModel(Dot.java:76)
at freemarker.core.Expression.getAsTemplateModel(Expression.java:89)
at freemarker.core.Assignment.accept(Assignment.java:90)
at freemarker.core.Environment.visit(Environment.java:196)
at freemarker.core.MixedContent.accept(MixedContent.java:92)
.....