Use remotes variables
Oops, forgot some copy and paste updates
Review for PLIP #12253, needs work before +1 for merging