Fixup for 7bd60f35