Remove idiot monkeypatch...