Reverted some overkill in reduced importing.