Amendment to changes in 56fcbcd154. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
56fcbcd154