This will be used by my next commit. But trying to get the build going since CI blew up
Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.