Revert "Undo packaging changes that break live image composes (#1086446)"
    
    This is the completely wrong way to fix this problem.  It's particularly
    bad because kkofler identified what was going wrong, and chose to ignore it
    in favor of this bad packaging change.
    
    Fix the inability to resolve cross-arch requires on livecd spins.  That's
    the right answer here. Having two different i686 builds of syslinux, one
    inside x86_64 packaging, is not in any way acceptable.
    
    This reverts commit 1bf8f6f5bf773c4cdbe8bb8c139d71312bcca92b.
    
    Signed-off-by: Peter Jones <pjones@redhat.com>