Fix duplicate deprecations 2 99

This is like #1158 but for 2.99.

/cc @soulcutter