[CLC-1177] Another attempt at fixing the replay error

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