Reverted a part of the previous commit.