Revert to importing manually instead of *