Revert "Merge branch 'release-4.6-unstable' into release-4.6-openacd-integration"

This reverts commit 569503cc9a63ae61dd6906a69c1a90300e657cf5, reversing
changes made to afb434b3432cfc24bf75123f1ddf1173c1aa73e6.