Revert namespaces change, refer to open issue.