Merge "fix searching of ancestors for removed methods"