This reverts commit d00c6003032bb6435a71333e99021d8643343a3f. They fail to rebuild and I'm not sure why. Reverting for now so that bpo is unblocked.
This reverts commit d00c6003032bb6435a71333e99021d8643343a3f. They fail to rebuild and I'm not sure why. Reverting for now so that bpo is unblocked.