Removed the stub of overloaded fix related stuff as it won't go into 2.3.20.