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