Cleanup obsolete compatibility code

See merge request !138333



Merged-by: Mark Chao <mchao@gitlab.com>
Approved-by: Mark Chao <mchao@gitlab.com>
Approved-by: Gosia Ksionek <mksionek@gitlab.com>
Reviewed-by: Mark Chao <mchao@gitlab.com>
Co-authored-by: Pavel Shutsin <pshutsin@gitlab.com>