VID-1711 Ditch the extra formatting in favor of this method being more similar to 'work'