Yep, remove the custom from the Linux kernel Makefile. You should not have to do anything else with the Linux kernel, either, though, unless you see other problems. In any case, try it and see.
The reaason your Linux kernel Makefile is set up like that is just another instance of RedHat trying not to let you shoot yourself in the foot, but causing other problems. FWIW...