Remove the older (not used) resumption mechanism

Change-Id: I0b6507a6f551c3f6d39e5310fb663beb51468ee0
Merge "Remove the older (not used) resumption mechanism"