VIVO-916: putting this fix in the maintenance branch, too