Remove code from bad rebase.