This reverts commit d7f646f7a4, reversing changes made to d6f9903f10. Conflicts: CHANGELOG.md Fixes issue #3809
d7f646f7a4
d6f9903f10