Partial revert "i965: "Fix" aux offsets"