Revert experimental changes mistakenly merged

Some test code from an alternative video path managed to get copied over when I created the new repository layout. This undoes the damage.

Change-Id: I53ac9266a78291aa1b752c4d97352f16053d9eaa