Improve workaround for YouTube's shitty internal race conditions