Alternate fix for the state context bug. Instead of messing around with CDM's internals, just reset the context instead.

Signed-off-by: Blake Skinner <bskinner@mit.edu>