Revert "-Werror=unused-but-set-variable second try"

This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.