CLC-2541 - Act as is not working

https://jira.media.berkeley.edu/jira/browse/CLC-2541