Revert to original question switch