*really* make xconfig work.

This is why you should always copy your tested files, instead of re-typing
them in your clean, commitable branch.

This is also why I'm not pushing anything upstream until it's stable, well
tested, and doesn't need changing again.