Revert commit that crash xctool