Merge "Revert "Straighten the dead char implementation.""