Complete rollback from i386 removal test