Sigh.  The crucial change was still missing from the previous
checkin. :-(
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index d45ee89..1bfda32 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5399,7 +5399,7 @@
 			else
 				continue;
 			res = PyDict_GetItem(dict, name);
-			if (res != NULL && !PyDescr_IsData(res)) {
+			if (res != NULL) {
 				Py_INCREF(res);
 				f = res->ob_type->tp_descr_get;
 				if (f != NULL) {