Code review comment for lp://staging/~facundo/ubuntuone-client/lr-udf-not-found

Much better. I'd suggest calling the one function revert_watches rather than restore_watches (the latter implying that watches are being put back rather than removed).