This change breaks TestBackup.makeSureStoreIdIsEnforced(), since it expects MismatchingStoreIdException to be thrown as is.