reverse 9191cd5dd2 & reimplement [#74855532]: Add numbers to report questions.

Better calculation of question numbers.
https://www.pivotaltracker.com/story/show/74855532