Replace original version done in 4976b2b3, f5463682 with those done in 0ccc8230
The changes in 0ccc8230 contain information on lags whereas the original ones don't
