Downstream builds are note sufficiently prepared. This reverts commit 176928cc1371c23d499b474fa95e076b61f776c4.