[wip] patch: Because this hurts.