This reverts commit 06ab498620, reversing changes made to 3c4d8d95d3. Conflicts: Changelog.md
06ab498620
3c4d8d95d3