diff --git a/question_types/quiz_question/quiz_question.core.inc b/question_types/quiz_question/quiz_question.core.inc
index 7c4c7f2..af5e803 100644
--- a/question_types/quiz_question/quiz_question.core.inc
+++ b/question_types/quiz_question/quiz_question.core.inc
@@ -749,10 +749,10 @@ abstract class QuizQuestionResponse {
    *  FAPI form array holding the question
    */
   public function getReportFormQuestion() {
-    $node = node_load($this->question->nid);
-    $node->no_answer_form = TRUE;
-    node_build_content($node, 'question');
-    return $node->content;
+    $node = node_load($this->question->nid, $this->question->vid);
+    $output = node_view($node, 'question');
+    unset($output['answers']);
+    return $output;
   }
 
   /**
diff --git a/question_types/quiz_question/quiz_question.module b/question_types/quiz_question/quiz_question.module
index 04a8967..68e9a4f 100644
--- a/question_types/quiz_question/quiz_question.module
+++ b/question_types/quiz_question/quiz_question.module
@@ -183,12 +183,12 @@ function quiz_question_answering_form($form, $form_state, $nodes, $result_id) {
     // Hide the label of the body field if this is an informative question.
     $options = !$question->isGraded() ? array('label' => 'hidden') : array();
 
-    node_build_content($node, 'question');
-    unset($node->content['answers']);
+    $output = node_view($node, 'question');
+    unset($output['answers']);
     $form['questions'][$node->nid] = array(
       '#attributes' => array('class' => array($class)),
       '#type' => 'container',
-      'header' => $node->content,
+      'header' => $output,
       'question' => array('#tree' => TRUE, $node->nid => $element),
     );