Reverting the question saving to the old behaviour