Revert two more accidental changes.