Prevent DTC escalation when storing timeouts

Still WIP

What do you guys think?

@johnsimons @johannesg