Cherry-pick YT video patch by Meticulus