Fix missing import from previous merge commit