Revert "Merge branch 'master' into trakt_watchlist"

This reverts commit 199db575de6a6b1d221174cd971f9eae139f8caf, reversing
changes made to caea3aeee0ce4980307636b8ca5408ad00a8f76a.