15c68ff3d3
This reverts commit d763541341
because of incompatible header file changes.
Re-apply when upgrading to 7.0.10