[PVP] Don't rely on BarAPI