Revert two bad commits.