I would like to suggest when using the Revert Template option (which reverts it to the default) that after doing this the template edit history is retained - currently it is wiped. The other day my partner used this to remove some edits she had made to the template as she thought they may have been causing some problems (it turned out they hadn't). She then discovered that there was no template history for her to find the previously edited version of the template to add the code back in. Fortunately I record all template edits elsewhere so it wasn't a problem and we could add these back in. I can however see some people who don't do this inadvertently losing their template edits.