Revert "Trying to get around PBR"

This reverts commit ca73012212aeecda6d188673922ca10cb0f22465.
Another attempt to get a "reasonable" build.

Change-Id: Ic11707cc226dccf7e58b725a1a679e0984aab0e4