Revert "Merge pull request #8763 from rexboy7/hd-video"

This reverts commit 0d589c6991bb4335d69957df3b68596d8aa38964, reversing
changes made to 6133c94a34b99a62486fe57a62bd147c0940e891.