Backport of #558 workaround into release branch

I should have done 7ceefba2adee29b22d803cf7ad477c170370378f in a separate
branch.  To avoid some of the messyness of git cherry-pick, I'm just
explicitly making this change instead of cherry-picking the commit.
Merge branch 'release' into develop