Removed extra copy of p4patch