Revert "Merge pull request #440 from Wikia/release-149-quiz-fix"

This reverts commit b5365ea762544cbe90243ffbfd1e9054f08f8105, reversing
changes made to 5119d31e46a03bff46107e9e97a18a6186448aed.