Fix imports expanded in previous commit