Revert "Remove unused variables"

This reverts commit 430aa2342ce4e7ed6e0dd9a2140aeebfcab14325.