Sync up with policy API changes.