Revert "Better encoding of questions."

This reverts commit c5172803d97470395ff2b0e90f9e5a4fa0625afa.