Fixup for 36fbdd7