Forgo the first, this patch is not perfect because It doesn't force an 
update.