[mesa/f15/master] Revert upstream patches causing SNB regression.