fix import breakage due to recent JB/HM reorgs