Revert "8.2"

This reverts commit cde7716f0fc913c365ebc14c3e971949ba1adb99.