Revert: This rollsback to commit 39fdea6

This6 reverts commit d677ecdb7bbdc33cc9daec33357850d01913bf4a.
Revert "Fix logic for questions script."

This reverts commit 1d516856576495263f861ddbc98c027cd4677551.