Fix customizations being blown over by failed diff parse