Restoring changes that were clobbered via an earlier merge. Tries to retain relevant other changes.