This line should also be changed in the `2.0` brach, @weaverryan