Added auto-wrapping back in.