Revert "Made Xcode 6.1 Swift friendly"

This reverts commit 62f4240e2679a2873e082aa7a8ecdf6c4d06dc4d.