Can we just do the one-line change in this branch and be happy?