Revert and bug fix with block protection