Fuck it, use master version of xctool