Incorporate monkeypatch from zdb