I just spent the morning doing this with my help desk team, although we just do it via command prompt at the recovery screen. We've had a 100% success rate so far at 93 devices and counting. I'm glad our organization practices read only Friday, at least.
I was going to say they should all turn into porn subs, but I think your way is easier and would likely have the same outcome anyway.