Reworked this commit.