Remove xctool workaround, no longer necessary