i965g: back out unintentional changes to linux-dri