Merge "Revert "Allow proxies to be compared.""