[fixup] build fix after bad rebase