Trying to get around PBR

Change-Id: Id58bc5c370b28922ac7d54d68c72e2c70c1783fe