Switch to a better approach for the manual override of raw text behavior