Merge branch 'revert-d1b32ceb' into 'master'

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

See merge request !456
6 jobs for master in 3 minutes and 44 seconds (queued for 4 seconds)