Revert "Revert "Only whitelists for applications""

This reverts commit bb4e4dfa7fe3dd32ee3d21e06c71e8b7d72a5fc1.