Moving util function into root package to avoid import cycle
2 files changed