Merge "Revert "Add basic checks for redefinition.""