Revert "Actual fix"

Found a better way
This reverts commit 668a65fd7e7dbf94e86dfff12ccf43a54fcaa2cd.
Revert "Try to fix optimizing apps and force close issue"

This reverts commit c9c264afa7f3b330078d9920b2a758dc457c5b5a.