Fix for 3810389, crash because of continuation() craziness. Revert back to the...