MDL-23204 grrr, fixed regression