Is there a reason to translate to {<<"default">>, Bucket} here? I thought all the code downstream from here could handle the old style, but I could be wrong.