Revert "suppress duplicate definition warnings, variables are hoisted"

This reverts commit 15e95f82da81b7a36770fea3df71244966cc5028.