Revert "Merge remote-tracking branch 'origin/master' into tv"

This reverts commit d3c5f2b62446b7f8d55afbf842ad67ba53827edb, reversing
changes made to a835d9e6b9c7b69a860ab6f875b022cbbf70a9c7.