Fixup for cbfda0f1