Revert last two commits.