Revert "Eliminating security warnings"

This reverts commit 2ee8fb023cb2242b2c106ab20bade33d994dbf01.