Reverting pull request 142
Merge pull request #143 from cdearborn/pull-req-release-mesa-1.6.1-master-5573eb358782c7431053bd9f26594f7ef2060d1e

Roll back pull req 142 in mesa 1.6.1 [1/1]