Fix the fix for issue #12149: it was incorrect, although it had the side

effect of appearing to resolve the issue.  Thanks to Mark Shannon for
noticing.

diff --cc Misc/NEWS
Simple merge

diff --cc Objects/typeobject.c
Simple merge