Remove revert patch -- fixed upstream.