Revert "Reworking Content-Security-Provider and X-FRAME-OPTION headers to allow fine tuned"

This reverts commit 60738e6e100fc0efc37aa9e1de9d8f3e4404f3d4.
Merging origin/fabbott/master-pending/revert into master