remove ugly workaround for Params::Classify bug, #32456