Move more patches out of 6680_patch