This reverts commit e1f25230. Reason for revert: breaks bp2build ci Change-Id: I7320ef679d8a1ba1d605cf0d3781854b97816358