JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1752

Apologies for the noise, the debug xml didn't make it through the last pull request.