Apple must have realized, one port consistency doesn't necessarily make sense. Would be glad to see it return. The USB C charging is so rigid, unplugging the USB C is like pulling out a engorged tick after several days of feasting.The Foxxcon insider was also asked if MagSafe will return and they replied yes and then were asked when. They said it is being tested now so 12-18 months.
So it looks like MagSafe will return using USB-C maybe in 2018 or early 2019 models.