swift234

For now, don't import properties in protocols at all (for real this time).

Uncomment the commented-out-for-testing lines in r3733.

Swift SVN r3737