diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index d3e78c3..e2a5121 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -76,11 +76,7 @@
 {
     const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
     if (obj == NULL) {
-        /* TODO(davidben): Return -1 here. Callers often check the result
-         * against -1 without handling a theoretical -2 output. Reporting a
-         * different result should not be necessary because invalid NIDs are
-         * almost always a programmer error.  */
-        return -2;
+        return -1;
     }
     return X509at_get_attr_by_OBJ(x, obj, lastpos);
 }
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index d2a51c0..00d6399 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -74,11 +74,7 @@
 {
     const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
     if (obj == NULL) {
-        /* TODO(davidben): Return -1 here. Callers often check the result
-         * against -1 without handling a theoretical -2 output. Reporting a
-         * different result should not be necessary because invalid NIDs are
-         * almost always a programmer error.  */
-        return -2;
+        return -1;
     }
     return X509v3_get_ext_by_OBJ(x, obj, lastpos);
 }