Revert previous two commits.