use the right version of xctool

self-merging