Restore changes removed from bad merge