Revert "Fix 'Wrong Inputs creation on (Add Service)'"