Second attempt at a commit.