As mentioned before, if we merge and finish up the relocate branch then the problem goes away. As I've said at least twice now, I want to see the actual example of how something produces these files before making any decisions.