Revert "Adjust p2.patch and p3.patch so that threads kernel still builds"