Merge "Revert "Relax HasSeenMethod check""