Revert "Remove skipped blocks reuse mechanism"
am: e7d7e9dd01

Change-Id: Id1558e2078b87aa6717431561f52141b2ef16537