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