Reverted a part of the last commit.