Revert JustArchi ArchiDroid Optimizations V3