Add import missing from rebased commit