Reverted the no-wrap change.