Switch to using free-range-app-utils