I believe you had added it under common utils in one of the previous PRs, so we should just be able to use that instead of repeating the code.