Google and Microsoft are finally shaking hands and agreeing to work together over Microsoft’s controversial YouTube app for Windows Phone devices.

“Microsoft and YouTube are working together to update the new YouTube for Windows Phone app to enable compliance with YouTube’s API terms of service, including enabling ads, in the coming weeks. Microsoft will replace the existing YouTube app in Windows Phone Store with the previous version during this time,” Microsoft and YouTube said in a joint statement sent to ReadWrite. 

Microsoft will take down the current YouTube app from the Windows Phone Marketplace and replace it with the version that Google and Microsoft will build together, based on YouTube’s application programming interfaces, the established way third-party apps access YouTube content.

Microsoft had originally built its own YouTube app for Windows Phone that had violated YouTube’s terms of service by stripping pre-rolled adds from the video content and allowing users to download videos. Last week, YouTube sent Microsoft a cease-and-desist letter warning that the Windows Phone app was a violation of the video website’s terms of service.