Revert 7e64f4a..f4cf063

This rolls back to commit 7e64f4ae2844f9131212f0c18bcc017f3fd2bbb0.
Changes for video