Indeed, this is what happened. And hey, Magneto needed a break from leading the brotherhood, too. His dramatic potential was never in dispute (see also: every speech he gives, plus the flowing cape). The manner of death was of course Tony's own idea.