Fix edge case of a bucket being removed the re-added.