Redid fix for #2275.