This reverts commit 5bfd89bda7c2d5ff167c7bcea0c8d69b0b498f08. It was causing build failures on ffmpeg on i686.