We could probably move this into the new util.