Fix botched merge conflict (2d97b62) resolution
authored by
seoul.systems
and committed by
tangled.org
d4bbd7bb
a9cdfb73