Partially reverts previous commit.