revert r2857 and add 7 days margin to inception