What's the reason behind this change? I don't know anything about the armoring, but we've just changed all the callers of this function from line-breaking to not-line-breaking.