Make service removal revertible