Fix the false redeclaration error for real this time.