I can't be bothered thinking up a commit message for this, look at the diffs