Revert "Remove duplicate variable instantiation"

This reverts commit 23b7db0b7a60b8f827e5feeca798f1345f0c631f.