Comment out panopoly_core patch and uncomment the other ones.