Revert "update for Xcode 6"

This reverts commit 44d18ea54d45c8416cf34e1a7ede4b1630672f1c.