Revert "navigator.id.watch when it is appropriate to (bug 825306)"

This reverts commit 066023514efa590a4f110ecff263dbe3af38e79c.