Revert "merge remote branch upstream/tv"

This reverts commit ceac878e55ade808f4f1792414cce3b08c937e55, reversing
changes made to 796aff451425de37e3a455b8004e8812ea193e02.