Revert "better security handling"

This reverts commit ccb9c288fe8b07bf697b5ab59f25047d178d5634.