[#1038] Fix an apparently botched merge (cont).