Revert to i686