Let's not trust these crappy finalizers
Merge branch 'topic/nofinalizers' into 2.9.x