V6.1.1: Revert all changes from V6.1
This tag has no release notes.