Bring rjbpop back from legacy