(maint) Remove some shims for compat with 0.25.x
Merge pull request #3237 from kylog/maint/remove-reference-stubs-for-0.25-compat

(maint) Remove some shims for compat with 0.25.x