Revert "Add namespace helper." - wrong branch

This reverts commit 832929a2c66b5d73bafc6fc68dd185184636c352.