Undo namespacing (will go on a separate branch)