Another regression, permanent fix for #833.