[Bug 744874] Last round of updates horribly broke LS-120 support