Reverted back to the old line handling.