Revert "Audit Fixes"

This reverts commit a86bfa0999a5599403764a95de4c371cec6dfd55.