Apply John McDonald's patch to the correct files