The key word here is *temporary*. Temporary hacks have a tendency to linger on perpetually.
I haven't looked into this but offhand it doesn't seem like it would be all that hard to do right.
Now ... I just noticed that Open Force added new file storage objects that aren't stored in the CR, something I'd missed earlier. Wonderful. I think we either need to throw out the CR or use it, this every-package-decides-for-itself approach is messy.