Revert "Merge branch 'release-security-functions' into 'release'"

This can only be merged after Bobby's fix in release is tested and merged to master.