Revert #2703
Update changelog
Bump version