Fixes(?) memory leak with time-limits.  Issue #1129, Issue #1427