Master reset... works. But it is far from permanent. Expect the service to disappear again and you won't be disappointed when it happens.
The crappy part about Master Reset - you have to re-enter anything you customized (home, favorites, phones).
Would be interesting to hear if there is a definitive answer (and yes, my 2011 Edge system has the 2012 "factory" software update).