Revert "Fix a redeclaration warning."

This reverts commit 1e262d169986fd8193d03a089ce6feacc53e6a63.