rpc parts should now build, so remove from patch