This reverts commit cee60a80. This change is not NFC because there is also an additional check for isImplicitDef in the branch above.