Unfudge now passing tests, also for #77472