Issue #3210: Revert C module changes and apply patch from Hirokazu Yamamoto instead
2 files changed