Revert "Fix patches"

This reverts commit f96c507cf0ad822c068e9fe1767e9f52c422d91a.
Revert "Remove 6680 driver and i386 support"

This reverts commit fd396989efa13b7ee0458a7960317fa0d7169662.