Hi Wil,
Thanks for reporting this usability issue. It's already been fixed internally (in bug number 1055678), and future releases will have the fix. I'm not aware of any automatable workaround – for the time being, I think you'll have to stick with the manual processes you've already discovered and described.
Cheers,
--
Darius
