Remove rgborder patch since its in main repo