Revert "Merge branch 'origin/OCEx'"

This reverts commit 4d546b9792b57d40be2ff9b6e8ae177913267d42, reversing
changes made to 2a47c303301640f93c8d8c4dd61f73b26c3f1aeb.