Revert "ArchiDroid Optimizations"

This reverts commit ea3a73aa4fae0b836fcac3aa78feb9b452ac4158.