monkeypatch is not needed anymore