[CLC-1741] Revert changes from CLC-1709

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