Get rid of rev4 PB13 usage