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