This reverts commit 8bf8ef71. At least 1 of these supposedly NFC commits wasn't - sanitizer bot is angry.