[OE-4309] Fix wrong package/function names due to bit rot/version skew
Revert "[OE-4310] Fix wrong package/function names due to bit rot/version skew"

This reverts commit 7efea7e5342c7fe7669e3ec2c6597f3b96c2d39b.
Merge branch 'release/1.7'