WIP/i965: Paul's workaround