X v4 will default to using XF86Config if XF86Config-4 is unavailable.

Back up both files, then transplant the rodent section from XF86Config-4 into XF86Config. With -4 renamed to something else, start X and see if it all works in the fashion you need it to.
Then simply cp XF86config XF86Config-4

HTH
--
TimW