Revert encapsulation; initial block matching