Revert 2nd stage service removal