RFC: Reduce number of packages that are built for i686