Revert recent soft wrap changes