Runaway URL-encoding of featureType filenames

When I create a featureType from a PostGIS table with a space in the name (eg. Foo Bar), I end up with directories in data/featureTypes that look like this:

postgis_Foo%252525252BBar

I assume that what is happening is this: The first time I save the featureType, it encodes the space as %2B. The next time I save the config (any part of it, I think), it reads that feature type filename, sees that it has a %, and encodes that as %25. The next time, it sees that it still contains a %, and encodes it again, ad infinitum. This repeats each time I make any changes to my config, until the filenames are longer than the legal filesystem limit. Then I can't save anything.