Revert some recent video changes, as they hindered performance, more than they helped it.  Revisit these at a later date, when I have time to test them one at a time.

Change-Id: I098721839b58a6071cfd9b4686e48289f770a4ad