reverting tagging, fix #7172