Revert "illegal redeclaration issue is back."

This reverts commit f97d848ebadcd65017bd09841c56bafde2dc032b.