Make tests pass on 1.8.7.