Partly revert previous changes, establish the new clock/dt system as discussed in #318