This should be part of LI, not origin-server