Some important edits didn't make it into the previous commit.