Revert to other set module, store timeout in correct internal format