Fixup for 92c84c91