[CLC-1813] Fix to get the build happy again

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

Only meddling in the interest of getting the build happy again. Will stepping on toes.