Revert "Added rollover extension period"

This reverts commit 00ab2f8b9d8f4490916344ae5e2ca85f5813ccc8.