Revert the last patch as it violates the conditions of sext/zext.