This reverts commit de722acd. Reason for revert: broke bp2build CI Change-Id: I535e8746e846c20f1a47c2a1eb0362276af49206