Disabled recent patches that are failing build