Essentially reverted last commit.