Follow-up to #6353 / #6356 which added the deprecations. For v4, we want to remove them entirely.
Follow-up to #6353 / #6356 which added the deprecations. For v4, we want to remove them entirely.