Revert "Change duplicate service"