Revert commit 1805577 until we can obfuscate the litemod.
Refer to branch NPE