2189 - Modified when we clear private non timeout based state

This ensures that when we start -> stop -> start that all deferred's are triggered correctly.

#2189