Revert "Merge Upstream LZO"

This reverts commit b10f0b3a3c4ad43852d736a7c103606105812b46.