Created separate PR: https://github.com/facebook/xctool/pull/315