This fixes #8374.  The prefixes have been removed, although it will currently read them.  It will just write over them without the prefix.