Change for #220

In order to be accepted in 3.1.0 there must be no API changes.