changes to allow MSC compile in xcode 6
Revert "changes to allow MSC compile in xcode 6"

This reverts commit 13cd0d2caf5dc44054235aaca78f03a2b6e66ca9.