revert d90efbf48f3b8bad8f29610583f6349b7ae3d802 and add 7 days margin to...