CG actually overrode this originally, so this change is probably more sensible to have here in case upstream removes it to get flash messages back