Remove no_wrap change from this branch