Revert "PR21408: Workaround the appearance of duplicate variables due to problems...