Just pushed the revert. Apologies for the inconvenience, and thanks for the bisect! http://cgit.freedesktop.org/mesa/mesa/commit/?id=29bcc73d4db639681f679b43075798c78f268ebf