Fixup for eb046d4b