Revert "Re-enable namespace"

This reverts commit 52dc4bae0aac14130c3f4c8ac47e1fcb98bf387f.