This shouldn't be in this pull request. Firstly, it's not related to the YouTube adapter work, and secondly, it's already on master.