Merge "Revert "Update method calls to avoid security errors""