Make service removal revertible
Make registry enabled/disabled feature work on revertion cases.

This avoids a race condition where a service controller misses an important notification because it was removed/reinstalled in a window of time where registry was enabled/disabled.