Merge "Revert "Fix Double.toString() for a tie case""