I was wrong, and I'm very glad I was. Magsafe is/was one of the best features of the old MacBooks. Also very glad the puck is not used to charge the laptops. I guess magsafe just means magnetic and safeTHIS!
You guys are delusional if you think Apple will bring back the original Magsafe. That would be a marketing disaster! They just introduced a new Magsafe concept aka "the puck". As much as I dislike it, it will not go away soon unfortunately.
What they'll do is add the possibility to charge by puck attached to the screen, as the power it can deliver is (almost) enough to drive the entire Macbook. On top of that you'll have your USB-C for charging "normally".
Unfortunately however I was not entirely wrong : the new magsafe is incompatible with the old, giving us another charging standard to adopt to, and rendering all my old power bricks obsolete for good.