I was going to do that as part of the work for the race in the certificate code, since it is still used.