Fixed by patches in #5442.