Fix issue from #567 that stopped videos from working. Clean up some code.
Merge pull request #570 from xsacha/video-fix

Fix issue from #567 that stopped videos from working. Clean up some code...