video: revert commit 97e149ba9e, implement a better fix for this.