Temporary workaround for issue 2820

I'll take a look at the root cause for the issue as well, but this workaround will help us get over the internal release build issues for now.