Revert upstream changes that break video resize