I think it's a trivial cherrypick, but I'll rebase onto master instead