more backporting to remove namespaces