Revert "Security Improvements"

This reverts commit 16bfd453b06ad1adf8c383a085b24c0efc1d4251.