0.0.4128

Revert "Merge branch 'release-8.2' into main"

This reverts commit c05ac06eadee88fc1b0d672aafac59cfef17fc80, reversing
changes made to f0d4a3d6472d91963fd81b75bacfde7c9b126f28.