Revert "Fix build of v3.1.6"

This reverts commit b294d89b4f7ea94073cf0e52f93d00fe5a7fb35b.
Really fix build of v3.1.6
Update Changelog.
Bump to 3.1.8