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