Revert changes that do not belong in this branch.