An attempt at fixing a bad commit.