Revert "Merge branch 'po-resolve-conflicts-featureflag-removal' into 'master'"

This reverts commit 6018a51d, reversing changes made to b12fd1b8 as it causes multiple errors in integration tests.

Fixes #3419 (closed)