swift234

Revert "If a function conversion fails, suggest wrapping in a closure."

This reverts commit r24987. The constraint system is choosing the fix
case over the normal case in Dollar.swift.

Swift SVN r24990