Revert ArchiDroid Optimization | Fixes