on a followup PR, we need to move this above method to the DI container. Please open a bug to track