Reverted change for legacy; without namespacing