Merge "Fixed how temporary remote services are set."