removing model changes so we can at least grab the DRY'ing up of that util function