Changes which were removed during downmerge