Again, move the scheduling of service restart upstream from onDestroy().

This should safely fix issue #51. Earlier fix got rolled back with commit 1197a678b742e18812cdab02415c824e17694c2e.