rework to account for utility method refactoring upstream