xref #10572 cc @parthea now that the testing infrastructure is more sound, I think this only requires a newish version of the apiclient (e.g. > 1.4)
