They were deprecated in 2.1, but never properly identified as such and thus never removed. Fixes #21765.