Revert "Apply Xcode 6.1 changes"

This reverts commit f771334dbb801cfbc88e9874da9d9622532ffa5c.
Apply Xcode 6.1 changes