Revert "more memory changes from cafs/msm-2.6.38"

This reverts commit 16b1e18e419496f7b09ebe9df5c4d54c8a4675e9.