Revert "More changes for XCode 9.0"
Revert "More changes for XCode 9.0"

This reverts commit e16c3fd309e375e8aa781a6495a74a3f89b0cb25.

zzxuanyuan/root,karies/root,karies/root,olifre/root,karies/root,zzxuanyuan/root,karies/root,zzxuanyuan/root,olifre/root,karies/root,root-mirror/root,zzxuanyuan/root,olifre/root,olifre/root,root-mirror/root,root-mirror/root,karies/root,root-mirror/root,zzxuanyuan/root,karies/root,root-mirror/root,root-mirror/root,karies/root,zzxuanyuan/root,root-mirror/root,karies/root,zzxuanyuan/root,olifre/root,root-mirror/root,olifre/root,root-mirror/root,zzxuanyuan/root,zzxuanyuan/root,root-mirror/root,karies/root,zzxuanyuan/root,olifre/root,karies/root,zzxuanyuan/root,olifre/root,zzxuanyuan/root,olifre/root,olifre/root,olifre/root,root-mirror/root