Restore clobbered changes from earlier commit