Revert "Merge branch 'ad-modal-on-mobile' into 'master'"

This reverts merge request !47 (merged) as it's missing a commit due to a faulty cherry-pick