This fixes #7969.  The role export is now correct again.