Another attempt to make GoCD do GATS properly