Merge "Revert "[HW17] Straighten the dead char implementation.""