Revert #230

This reverts commit b453fa1f18ebc41b49da984ff911365c42a73d06, reversing
changes made to ee44a9c4ec9737590384c9842d34f385bf1e255e.

Reverting because we actually want to do this per question, instead of per-survey.