the current patches are failing to apply cleanly, created an all-inclusive patch