Rebased the stripping patch