Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit b1cbce0249054d7253a2752feedb38229abbdffd.