Make mesa work against Mir trunk again