This pull request should not work with py25.