Revert to old time management (#1351)