Revert "Security issues"

This reverts commit c1c0eaa492b24936c87d25fdc336a87f422dd648.