ARRRGH. Merge fixup