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