Revert "Change to Question class (problems with back issues)"

This reverts commit 323967b8ae031ec47c2760f3351de38ab2be0a41.