Revert "Fix -Wshadow"

This reverts commit 139d3291933c05e83c9436a6a105ea2aaecf832f.
Remove -Wshadow and mirror update to SA