Revert "Hack to hide namespaces"

This reverts commit da44706d3295648b4d96d26c554040d4ce7cd49e.