Ripping out the PBR dependency