This is leading to "'super' object has no attribute '__del__'" errors in some situations. As explained in #132476 this is only for future proofing, so don't do it yet. This reverts commit f301952b6a.
f301952b6a