Revert old fix and move fix to apply in Series

Author: ThomasKluiters

pandas/core/arrays/datetimelike.py

@@ -713,7 +713,7 @@ def map(self, mapper):
         # Else, just rewrite _map_infer_values to do the right thing.
         from pandas import Index
 
-        return Index(self).map(mapper)
+        return Index(self).map(mapper).array
 
     # ------------------------------------------------------------------
     # Null Handling

pandas/core/series.py

@@ -3687,7 +3687,9 @@ def f(x):
 
         if len(mapped) and isinstance(mapped[0], Series):
             from pandas.core.frame import DataFrame
-            return DataFrame(mapped.tolist(), index=self.index)
+            if not isinstance(mapped, ExtensionArray):
+                mapped = mapped.tolist()
+            return DataFrame(mapped, index=self.index)
         else:
             return self._constructor(mapped,
                                      index=self.index).__finalize__(self)