Minor consistency fix from 3.1.X.