Revert "Fix namespace handling"