GUAC-628: Backport fix from GUAC-618.