Revert "Merge branch 'ad-app-feature-flag' into 'master'"

This reverts merge request !452
5 jobs for revert-d1b32ceb in 10 minutes and 14 seconds (queued for 7 seconds)