Ahh I didn't realized this was related to the `ModelForm` changes. I guess this belongs here then.