Move service disable/enable code to tasks, thus making enable/disable revertible operations
Make Registration.removal revertible.