Revert to 2.x multiline behavior