Merge "Revert "Warn on overriding of hidden methods""