Re-adding a modified patch to support clang