The double underscore macros have been fixed upstream