If we patch it the source is no longer buildable on non-usrmerged system. I suppose the fixup in rpm can be done both ways, and then rpm would build either way, and the expanded tree only on the distribution for which it is intended.