Fix a strange new failure in 1.9.2/3.2