Factor out duplicated code

Authored by vkrause on Oct 6 2018, 12:10 PM.