Patched for ls-xl v3 support.